From 446921111ef1642d8a526412299f2cd562aae483 Mon Sep 17 00:00:00 2001
From: Jamie Curnow <jc@jc21.com>
Date: Wed, 20 Jun 2018 16:57:34 +1000
Subject: [PATCH] Add / edit Users

---
 src/backend/internal/user.js     |  7 +++++--
 src/frontend/js/app/user/form.js | 18 +++++-------------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/backend/internal/user.js b/src/backend/internal/user.js
index 6d54556..75fe897 100644
--- a/src/backend/internal/user.js
+++ b/src/backend/internal/user.js
@@ -39,6 +39,8 @@ const internalUser = {
                     .insertAndFetch(data);
             })
             .then(user => {
+                return internalUser.get(access, {id: user.id});
+                /*
                 return authModel
                     .query()
                     .insert({
@@ -48,8 +50,9 @@ const internalUser = {
                         meta:    {}
                     })
                     .then(() => {
-                        return internalUser.get(access, {id: user.id, expand: ['services']});
+                        return internalUser.get(access, {id: user.id});
                     });
+                    */
             });
     },
 
@@ -110,7 +113,7 @@ const internalUser = {
                     });
             })
             .then(() => {
-                return internalUser.get(access, {id: data.id, expand: ['services']});
+                return internalUser.get(access, {id: data.id});
             });
     },
 
diff --git a/src/frontend/js/app/user/form.js b/src/frontend/js/app/user/form.js
index 4a750e6..7d8ee3b 100644
--- a/src/frontend/js/app/user/form.js
+++ b/src/frontend/js/app/user/form.js
@@ -22,23 +22,15 @@ module.exports = Mn.View.extend({
     },
 
     events: {
-        /*
-        'click @ui.cancel': function (e) {
-            e.preventDefault();
-            App.UI.closeModal();
-        },
-        */
 
-        'submit @ui.form': function (e) {
+        'click @ui.save': function (e) {
             e.preventDefault();
             let view = this;
             let data = this.ui.form.serializeJSON();
 
             // Manipulate
             data.roles = [];
-            if (
-                (this.model.get('id') === Cache.User.get('id') && this.model.isAdmin()) ||
-                (typeof data.is_admin !== 'undefined' && data.is_admin)) {
+            if ((this.model.get('id') === Cache.User.get('id') && this.model.isAdmin()) || (typeof data.is_admin !== 'undefined' && data.is_admin)) {
                 data.roles.push('admin');
                 delete data.is_admin;
             }
@@ -59,12 +51,12 @@ module.exports = Mn.View.extend({
                         Cache.User.set(result);
                     }
 
-                    view.model.set(result);
-                    App.UI.closeModal();
-
                     if (view.model.get('id') !== Cache.User.get('id')) {
                         Controller.showUsers();
                     }
+
+                    view.model.set(result);
+                    App.UI.closeModal();
                 })
                 .catch(err => {
                     alert(err.message);