From 6cac521b592b93d6076c65c6eb590851d47ff855 Mon Sep 17 00:00:00 2001
From: Kenneth Jao <ksjdragon@gmail.com>
Date: Thu, 18 Aug 2016 18:47:03 -0400
Subject: [PATCH 1/2] Fixed adding work bug

---
 hourglass/client/main/main.js | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/hourglass/client/main/main.js b/hourglass/client/main/main.js
index a546dfe..06fa93c 100644
--- a/hourglass/client/main/main.js
+++ b/hourglass/client/main/main.js
@@ -78,13 +78,14 @@ Template.registerHelper('myClasses', () => {
 	     	array[i].thisClassWork = thisWork;
     	}
         Session.set("noclass",false);
+        console.log(array);
     	return array;
     }	
 });
 
 Template.main.helpers({
     schoolName() {
-    	Session.set("calendarclasses", Meteor.user().profile.classes);
+        Session.set("calendarclasses", Meteor.user().profile.classes);
         return " - " + Meteor.user().profile.school;
     },
     iconColor(icon) {
@@ -136,7 +137,7 @@ Template.main.helpers({
     calendarOptions() {
         var events = [];
         calendarclasses = Session.get("calendarclasses");
-        var cursor = work.find({class: {$in: userclasses}});
+        var cursor = work.find({class: {$in: calendarclasses}});
         cursor.forEach(function(current) {
             backgroundColor = calendarColors[current.type];
             title = current.name;
@@ -304,13 +305,15 @@ Template.main.events({
         openDivFade(document.getElementsByClassName("overlay")[0]);
     },
     'click .change' (event) {
-    	if(!(Meteor.userId() === Session.get("currentWork").creator || 
-    		Roles.userIsInRole(Meteor.userId(), ['superadmin', 'admin']) ||
-    		classes.findOne({_id: Session.get("currentWork")._id}).moderators.indexOf(Meteor.userId()) !== -1 ||
-    		classes.findOne({_id: Session.get("currentWork")._id}).blockEdit.indexOf(Meteor.userId()) !== -1 ||
-    		classes.findOne({_id: Session.get("currentWork")._id}).banned.indexOf(Meteor.userId()) !== -1
-    		)) return;
-
+        if(!Session.get("newWork")) {
+            if(!(Meteor.userId() === Session.get("currentWork").creator || 
+            Roles.userIsInRole(Meteor.userId(), ['superadmin', 'admin']) ||
+            classes.findOne({_id: Session.get("currentWork")._id}).moderators.indexOf(Meteor.userId()) !== -1 ||
+            classes.findOne({_id: Session.get("currentWork")._id}).blockEdit.indexOf(Meteor.userId()) !== -1 ||
+            classes.findOne({_id: Session.get("currentWork")._id}).banned.indexOf(Meteor.userId()) !== -1
+            )) return;   
+        }
+    	
     	var ele = event.target;
         var sessval = Session.get("modifying");
         if (ele.id !== sessval && sessval !== null) closeInput(sessval);

From 444ecc5029815ad003a537884cb692a107f009ce Mon Sep 17 00:00:00 2001
From: Kenneth Jao <ksjdragon@gmail.com>
Date: Thu, 18 Aug 2016 18:53:03 -0400
Subject: [PATCH 2/2] Fix merge

---
 hourglass/client/main/main.js | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/hourglass/client/main/main.js b/hourglass/client/main/main.js
index 7a5f2c6..3b9a233 100644
--- a/hourglass/client/main/main.js
+++ b/hourglass/client/main/main.js
@@ -85,22 +85,14 @@ Template.registerHelper('myClasses', () => {
 	     	    array[i].thisClassWork = thisWork;
     	  }
         Session.set("noclass",false);
-<<<<<<< HEAD
-        console.log(array);
     	return array;
-=======
-    	  return array;
->>>>>>> afd60acb9ab69a32ee86ae92e86e0d67e39af7be
+
     }	
 });
 
 Template.main.helpers({
     schoolName() {
-<<<<<<< HEAD
         Session.set("calendarclasses", Meteor.user().profile.classes);
-=======
-    	  Session.set("calendarclasses", Meteor.user().profile.classes);
->>>>>>> afd60acb9ab69a32ee86ae92e86e0d67e39af7be
         return " - " + Meteor.user().profile.school;
     },
     iconColor(icon) {