Asi 23 04 camps add more managers

routes/api_camps_routes.js

@@ -125,12 +125,12 @@ var __camps_update_status = (camp_id, user_id, action, camp_mgr, res) => {
  var _after_update = () => {
  console.log(action + " from camp " + data.camp_id + " of user " + data.user_id + " / status: " + data.status);
  if (mail_delivery.template !== '') {
- // let props={};
- if (mail_delivery.to_mail !== '') {
+ if (!user) {
  emailDeliver(mail_delivery.to_mail, mail_delivery.subject, mail_delivery.template, { user: user, camp: camp.toJSON(), camp_manager: camp_manager }); // notify the user
  } else {
  User.forge({ user_id: user_id }).fetch().then((user) => {
- emailDeliver(user.attributes.email, mail_delivery.subject, mail_delivery.template, { user: user.toJSON(), camp: camp.toJSON(), camp_manager: camp_manager }); // notify the user
+ let email = mail_delivery.to_mail !== '' ? mail_delivery.to_mail : user.attributes.email;
+ emailDeliver(email, mail_delivery.subject, mail_delivery.template, { user: user.toJSON(), camp: camp.toJSON(), camp_manager: camp_manager }); // notify the user
  });
  }
  }
@@ -379,7 +379,7 @@ module.exports = (app, passport) => {
  var user_id = req.params.user_id;
  var camp_id = req.params.camp_id;
  var action = req.params.action;
- var actions = ['approve', 'remove', 'revive', 'reject','approve_mgr','remove_mgr'];
+ var actions = ['approve', 'remove', 'revive', 'reject', 'approve_mgr', 'remove_mgr'];
  if (actions.indexOf(action) > -1) {
  __camps_update_status(camp_id, user_id, action, req.user, res);
  } else {

views/emails/camps/join_cancel.jade

@@ -53,15 +53,15 @@ body
  p.subtitle(dir='rtl')
  span שלום #{camp_manager.first_name},
  br
- span #{user.name} (#{user.email}) ביטל את השתתפותו במחנה שלך "#{camp.camp_name_he}"
+ span #{user.first_name} #{user.last_name} (#{user.email}) ביטל את השתתפותו במחנה שלך "#{camp.camp_name_he}"
  p(dir='rtl')
  span לפאנל ניהול חברים היכנס בלינק הבא
  a(href='//spark.midburn.org/') Spark
  h1 Cancellation of camp membership
  p.subtitle
  span Hello #{camp_manager.first_name},
  br
- span #{user.name} (#{user.email}) has canceled his join request of your camp "#{camp.camp_name_en}"
+ span #{user.first_name} #{user.last_name} (#{user.email}) has canceled his join request of your camp "#{camp.camp_name_en}"
  p
  span For camp members management panel follow this link
  a(href='//spark.midburn.org/') Spark

views/emails/camps/join_request.jade

@@ -53,15 +53,15 @@ body
  p.subtitle(dir='rtl')
  span שלום #{camp_manager.first_name},
  br
- span #{user.name} (#{user.email}) ביקש להצטרף למחנה שלך "#{camp.camp_name_he}"
+ span #{user.first_name} #{user.last_name} (#{user.email}) ביקש להצטרף למחנה שלך "#{camp.camp_name_he}"
  p(dir='rtl')
  span לאישור חברים היכנס בלינק הבא
  a(href='//spark.midburn.org/') Spark
  h1 Camp Join Request
  p.subtitle
  span Hello #{camp_manager.first_name},
  br
- span #{user.name} (#{user.email}) requested to join your camp "#{camp.camp_name_en}"
+ span #{user.first_name} #{user.last_name} (#{user.email}) requested to join your camp "#{camp.camp_name_en}"
  p
  span For camp members management panel follow this link
  a(href='//spark.midburn.org/') Spark

views/pages/camps/partials/members_table.jade

@@ -19,23 +19,23 @@ table.table.table-striped.table-hover
  td {{member.current_event_id_ticket_count}}
  //- td {{member.earlyArrival ? 'yes':'no'}}
  td
- a.cursor-p(ng-click='updateUser(member.name, member.user_id, "reject")', ng-if="member.can_reject" ) 
+ a.cursor-p(ng-click='updateUser(member.name, member.user_id, "reject")', ng-if="member.can_reject")  
  button.btn.btn-xs
  span(class='glyphicon glyphicon-remove')
  =t('camps:members.reject')
- a.cursor-p(ng-click='updateUser(member.name, member.user_id, "approve")', ng-if="member.can_approve") 
+ a.cursor-p(ng-click='updateUser(member.name, member.user_id, "approve")', ng-if="member.can_approve")  
  button.btn.btn-xs
  span(class='glyphicon glyphicon-ok')
  =t('camps:members.approve')
- a.cursor-p(ng-click='updateUser(member.name, member.user_id, "approve_mgr")', ng-if="member.can_approve_mgr") 
+ a.cursor-p(ng-click='updateUser(member.name, member.user_id, "approve_mgr")', ng-if="member.can_approve_mgr")  
  button.btn.btn-xs
  span(class='glyphicon glyphicon-king')
  =t('camps:members.approve_as_manager')
- a.cursor-p(ng-click='updateUser(member.name, member.user_id, "remove_mgr")', ng-if="member.can_remove_mgr") 
+ a.cursor-p(ng-click='updateUser(member.name, member.user_id, "remove_mgr")', ng-if="member.can_remove_mgr")  
  button.btn.btn-xs
  span(class='glyphicon glyphicon-king')
  =t('camps:members.remove_manager')
- a.cursor-p(ng-click='updateUser(member.name, member.user_id, "remove")', ng-if="member.can_remove") 
+ a.cursor-p(ng-click='updateUser(member.name, member.user_id, "remove")', ng-if="member.can_remove")  
  button.btn.btn-xs 
  span(class='glyphicon glyphicon-remove')
  =t('camps:members.remove')