Merge branch 'master' of https://github.com/SilentImp/javascript-nodejs

SilentImp · SilentImp · commit 116b6f4339aa · 2015-12-08T09:48:56.000+02:00
diff --git a/handlers/courses/controller/groupMaterials.js b/handlers/courses/controller/groupMaterials.js
@@ -112,23 +112,26 @@ exports.post = function*() {
 
   yield group.persist();
 
-  var recipients = participants
-    .map(function(participant) {
-      return {email: participant.user.email, name: participant.fullName};
+  if (this.request.body.notify) {
+    var recipients = participants
+      .map(function(participant) {
+        return {email: participant.user.email, name: participant.fullName};
+      });
+
+    yield sendMail({
+      templatePath: path.join(__dirname, '../templates/email/materials'),
+      subject:      "Добавлены материалы курса",
+      to:           recipients, // recipients
+      comment:      material.comment,
+      link:         config.server.siteHost + `/courses/groups/${group.slug}/materials`,
+      fileLink:     config.server.siteHost + `/courses/download/${group.slug}/${material.filename}`,
+      fileTitle:    material.title
     });
 
-  yield sendMail({
-    templatePath: path.join(__dirname, '../templates/email/materials'),
-    subject:      "Добавлены материалы курса",
-    to:           recipients, // recipients
-    comment:      material.comment,
-    link:         config.server.siteHost + `/courses/groups/${group.slug}/materials`,
-    fileLink:     config.server.siteHost + `/courses/download/${group.slug}/${material.filename}`,
-    fileTitle:    material.title
-  });
-
-  this.addFlashMessage('success', 'Материал добавлен, уведомления разосланы.');
-
+    this.addFlashMessage('success', 'Материал добавлен, уведомления разосланы.');
+  } else {
+    this.addFlashMessage('success', 'Материал добавлен, уведомления НЕ рассылались.');
+  }
   this.redirect(this.originalUrl);
 };
 
diff --git a/handlers/courses/templates/feedback/list.jade b/handlers/courses/templates/feedback/list.jade
@@ -12,7 +12,7 @@ block append variables
 
 block append head
   !=js("coursesFeedbackList", {defer: true})
-  if user.isAdmin || user.teachesCourses.length
+  if user && (user.isAdmin || user.teachesCourses.length)
     !=js("coursesFeedbackShow", {defer: true})
 
 
diff --git a/handlers/courses/templates/groupMaterials.jade b/handlers/courses/templates/groupMaterials.jade
@@ -29,6 +29,10 @@ block content
       +e.line
         +b('span').text-input.__input
           +e('input').control(name="comment" placeholder='Комментарий (опционально)')
+      +e.line
+        +e('label').name
+          +e('input').input(type="checkbox" name="notify" checked value="1")
+          | Рассылать уведомления
       +e.line
         +b('button').button._action.__submit(type="submit")
           +e('span').text Добавить
diff --git a/handlers/profile/templates/index.jade b/handlers/profile/templates/index.jade
@@ -8,7 +8,7 @@ block append variables
 block append head
   base(href=user.getProfileUrl() + '/')
   !=css("quiz")
-  if user.isAdmin || user.teachesCourses.length
+  if user && (user.isAdmin || user.teachesCourses.length)
     !=js("coursesFeedbackShow", {defer: true})
 
 block content
diff --git a/handlers/profileGuest/templates/aboutme.jade b/handlers/profileGuest/templates/aboutme.jade
@@ -2,12 +2,12 @@ extends root
 
 block append head
   !=js("profileGuestAboutMe", {defer: true})
-  if user.isAdmin || user.teachesCourses.length
+  if user && (user.isAdmin || user.teachesCourses.length)
     !=js("coursesFeedbackShow", {defer: true})
 
 
 block profileContent
-  if user.isAdmin
+  if user && user.isAdmin
     +b.profile-field
       +e.lcell
         +e.name Email
