Ignore accordion click for up/down arrows

* After upgrading to newest angular-ui, you now have to stopPropagation and preventDefault to ignore accordion header click.
  Need to ignore in case of moving fields up/down
* Refresh event on event page if users/teams added/removed.  This will keep any 'users' dropdowns correctly populated in form preview.

Author: newmanw

public/app/admin/events/event.controller.js

@@ -108,7 +108,9 @@ function AdminEventController($scope, $location, $filter, $routeParams, $q, $uib
     $scope.eventNonMembers = _.reject($scope.eventNonMembers, function(item) { return item.id === user.id; });
 
     eventTeam.users.push({id: user.id});
-    eventTeam.$save();
+    eventTeam.$save(function() {
+      $scope.event.$get({popualte: false});
+    });
   }
 
   $scope.removeMember = function(member) {
@@ -128,7 +130,9 @@ function AdminEventController($scope, $location, $filter, $routeParams, $q, $uib
     $scope.eventNonMembers.push(user);
 
     eventTeam.users = _.reject(eventTeam.users, function(u) { return user.id === u.id; });
-    eventTeam.$save();
+    eventTeam.$save(function() {
+      $scope.event.$get({populate: false});
+    });
   }
 
   $scope.addLayer = function(layer) {

public/app/admin/events/event.edit.form.controller.js

@@ -27,6 +27,8 @@ function AdminEventEditFormController($rootScope, $scope, $location, $filter, $r
   $scope.$watch('event.form', function(newForm, oldForm) {
     if (!newForm || !oldForm) return;
 
+    if ($scope.saving) return;
+
     $scope.unSavedChanges = true;
   }, true);
 
@@ -107,6 +109,7 @@ function AdminEventEditFormController($rootScope, $scope, $location, $filter, $r
 
   $scope.moveFieldUp = function(e, fieldToMoveUp) {
     e.stopPropagation();
+    e.preventDefault();
 
     // find first non-archived field above me
     // and switch our ids to re-order
@@ -132,6 +135,7 @@ function AdminEventEditFormController($rootScope, $scope, $location, $filter, $r
 
   $scope.moveFieldDown = function(e, fieldToMoveDown) {
     e.stopPropagation();
+    e.preventDefault();
 
     // find the first non-archived field below me
     // and switch our ids to re-order
@@ -173,7 +177,7 @@ function AdminEventEditFormController($rootScope, $scope, $location, $filter, $r
     return layer.type;
   };
 
-  $scope.saveForm = function() {    
+  $scope.saveForm = function() {
     formSaved = false;
     $scope.saving = true;
     $scope.uploadIcons = true;

routes/events.js

@@ -194,18 +194,35 @@ module.exports = function(app, security) {
         req.newEvent.layerIds = req.newEvent.layerIds.split(",");
       }
 
-      Event.create(req.newEvent, function(err, event) {
-        if (err) return next(err);
+      function createEvent(callback) {
+        Event.create(req.newEvent, callback);
+      }
 
+      function importForm(event, callback) {
         new api.Form(event).import(req.files.form, function(err, form) {
-          if (err) return next(err);
+          callback(err, event, form);
+        });
+      }
 
-          Event.update(event._id, {form: form}, function(err, event) {
-            if (err) return next(err);
+      function updateEvent(event, form, callback) {
+        Event.update(event._id, {form: form}, callback);
+      }
 
-            res.status(201).json(event);
-          });
+      function populateUserFields(event, callback) {
+        new api.Form(event).populateUserFields(function(err) {
+          callback(err, event);
         });
+      }
+
+      async.waterfall([
+        createEvent,
+        importForm,
+        updateEvent,
+        populateUserFields
+      ], function (err, event) {
+        if (err) return next(err);
+
+        res.status(201).json(event);
       });
     }
   );
@@ -242,7 +259,11 @@ module.exports = function(app, security) {
       Event.update(req.event._id, req.newEvent, {populate: req.parameters.populate}, function(err, event) {
         if (err) return next(err);
 
-        res.json(event);
+        new api.Form(event).populateUserFields(function(err) {
+          if (err) return next(err);
+
+          res.json(event);
+        });
       });
     }
   );