Merge pull request #317 from weseek/feat/grouping-users

Feat/grouping users

lib/models/user-group.js

@@ -107,7 +107,7 @@ class UserGroup {
           throw new Exception('UserGroup data is not exists. id:', id);
         }
         else {
-          userGroupData.remove();
+          return userGroupData.remove();
         }
       });
   }

lib/routes/admin.js

@@ -773,13 +773,14 @@ module.exports = function(crowi, app) {
   actions.userGroup.removeCompletely = function (req, res) {
     const id = req.body.user_group_id;
 
-    UserGroup.removeCompletelyById(id, function (err, removed) {
-      if (err) {
-        debug('Error while removing userGroup.', err, id);
-        req.flash('errorMessage', '完全な削除に失敗しました。');
-      } else {
+    UserGroup.removeCompletelyById(id)
+    .then(() => {
         req.flash('successMessage', '削除しました');
-      }
+      return res.redirect('/admin/user-groups');
+    })
+    .catch((err) => {
+      debug('Error while removing userGroup.', err, id);
+      req.flash('errorMessage', '完全な削除に失敗しました。');
       return res.redirect('/admin/user-groups');
     });
   }

lib/routes/index.js

@@ -115,7 +115,7 @@ module.exports = function(crowi, app) {
   app.post('/admin/user-group/create'      , form.admin.userGroupCreate, loginRequired(crowi, app), middleware.adminRequired(), csrf, admin.userGroup.create);
   app.post('/admin/user-group/:userGroupId/update', loginRequired(crowi, app), middleware.adminRequired(), csrf, admin.userGroup.update);
   app.post('/admin/user-group/:userGroupId/picture/delete', loginRequired(crowi, app), admin.userGroup.deletePicture);
-  app.post('/_api/admin/user-group.remove' , loginRequired(crowi, app), middleware.adminRequired(), csrf, admin.userGroup.removeCompletely);
+  app.post('/admin/user-group.remove' , loginRequired(crowi, app), middleware.adminRequired(), csrf, admin.userGroup.removeCompletely);
   app.post('/_api/admin/user-group/:userGroupId/picture/upload', loginRequired(crowi, app), uploads.single('userGroupPicture'), admin.userGroup.uploadGroupPicture);
 
   // user-group-relations admin

lib/views/admin/user-groups.html

@@ -90,7 +90,7 @@
               </span>
             </div>
             <div class="modal-footer">
-              <form method="post" id="admin-user-groups-delete" class="text-right">
+              <form action="/admin/user-group.remove" method="post" id="admin-user-groups-delete" class="text-right">
                 <input type="hidden" name="user_group_id" value="">
                 <input type="hidden" name="_csrf" value="{{ csrf() }}">
                 <button type="submit" value="" class="btn btn-sm btn-danger">

resource/js/legacy/crowi-admin.js

@@ -65,10 +65,6 @@ $(function() {
     $('#admin-user-groups-delete input[name=user_group_id]').val(userGroupId);
   });
 
-  $('form#admin-user-groups-delete').on('submit', function (e) {
-    $.post('/_api/admin/user-group.remove', $(this).serialize(), function (res) {});
-  });
-
   $('form#user-group-relation-create').on('submit', function (e) {
     $.post('/admin/user-group-relation/create', $(this).serialize(), function (res) {
       $('#admin-add-user-group-relation-modal').modal('hide');