kjao/archive
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed last commit

Browse Source
This commit is contained in:
Kenneth Jao 2016-08-19 22:04:32 -04:00
parent 45576e7619
commit 12e9017959
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hourglass/client/main/main.js
View File

@ -143,13 +143,6 @@ Template.main.helpers({
} }
}, },
calendarOptions() { calendarOptions() {
var inRole = false;
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
) var inRole = true;
return { return {
id: "fullcalendar", id: "fullcalendar",
height: window.innerHeight * 0.8, height: window.innerHeight * 0.8,
@ -163,6 +156,13 @@ Template.main.helpers({
var events = []; var events = [];
var cursor = work.find({class: {$in: Session.get("calendarclasses")}}); var cursor = work.find({class: {$in: Session.get("calendarclasses")}});
cursor.forEach(function(current) { cursor.forEach(function(current) {
var inRole = false;
if(Meteor.userId() === current.creator ||
Roles.userIsInRole(Meteor.userId(), ['superadmin', 'admin']) ||
classes.findOne({_id: current._id}).moderators.indexOf(Meteor.userId()) !== -1||
classes.findOne({_id: current._id}).blockEdit.indexOf(Meteor.userId()) !== -1 ||
classes.findOne({_id: current._id}).banned.indexOf(Meteor.userId()) !== -1
) inRole = true;
backgroundColor = workColors[current.type]; backgroundColor = workColors[current.type];
title = current.name; title = current.name;
duedate = current.dueDate.toISOString().slice(0, 10); duedate = current.dueDate.toISOString().slice(0, 10);
@ -191,7 +191,7 @@ Template.main.helpers({
var thisReadWork = formReadable(thisWork); var thisReadWork = formReadable(thisWork);
Session.set("currentReadableWork",thisReadWork); Session.set("currentReadableWork",thisReadWork);
openDivFade(document.getElementsByClassName("overlay")[0]); openDivFade(document.getElementsByClassName("overlay")[0]);
}, }
/*dayClick: function(date, jsEvent, view) { /*dayClick: function(date, jsEvent, view) {
//Make user select class //Make user select class
Session.set("newWork", true); Session.set("newWork", true);