routes refactor

lib/routes/admin.js

@@ -1172,7 +1172,7 @@ module.exports = function(crowi, app) {
   };
 
   actions.api.removeGlobalNotification = async(req, res) => {
-    const id = req.query.id;
+    const id = req.params.id;
 
     try {
       await GlobalNotificationSetting.findOneAndRemove({_id: id});

lib/routes/index.js

@@ -106,12 +106,12 @@ module.exports = function(crowi, app) {
   app.post('/_api/admin/notification.add'    , loginRequired(crowi, app) , middleware.adminRequired() , csrf, admin.api.notificationAdd);
   app.post('/_api/admin/notification.remove' , loginRequired(crowi, app) , middleware.adminRequired() , csrf, admin.api.notificationRemove);
   app.get('/_api/admin/users.search'         , loginRequired(crowi, app) , middleware.adminRequired() , admin.api.usersSearch);
-  app.get('/admin/global-notification/detail', loginRequired(crowi, app) , middleware.adminRequired() , admin.globalNotification.detail);
-  app.get('/admin/global-notification/detail/:id', loginRequired(crowi, app) , middleware.adminRequired() , admin.globalNotification.detail);
-  app.post('/admin/global-notification/create', loginRequired(crowi, app) , middleware.adminRequired() , form.admin.notificationGlobal, admin.globalNotification.create);
+  app.get('/admin/global-notification/new'   , loginRequired(crowi, app) , middleware.adminRequired() , admin.globalNotification.detail);
+  app.get('/admin/global-notification/:id'   , loginRequired(crowi, app) , middleware.adminRequired() , admin.globalNotification.detail);
+  app.post('/admin/global-notification/new'  , loginRequired(crowi, app) , middleware.adminRequired() , form.admin.notificationGlobal, admin.globalNotification.create);
   app.post('/_api/admin/global-notification/toggleIsEnabled', loginRequired(crowi, app) , middleware.adminRequired() , admin.api.toggleIsEnabledForGlobalNotification);
-  app.post('/admin/global-notification/update', loginRequired(crowi, app) , middleware.adminRequired() , form.admin.notificationGlobal, admin.globalNotification.update);
-  app.post('/admin/global-notification/remove', loginRequired(crowi, app) , middleware.adminRequired() , admin.api.removeGlobalNotification);
+  app.post('/admin/global-notification/:id/update', loginRequired(crowi, app) , middleware.adminRequired() , form.admin.notificationGlobal, admin.globalNotification.update);
+  app.post('/admin/global-notification/:id/remove', loginRequired(crowi, app) , middleware.adminRequired() , admin.api.removeGlobalNotification);
 
   app.get('/admin/users'                , loginRequired(crowi, app) , middleware.adminRequired() , admin.user.index);
   app.post('/admin/user/invite'         , form.admin.userInvite ,  loginRequired(crowi, app) , middleware.adminRequired() , csrf, admin.user.invite);

lib/views/admin/global-notification-detail.html

@@ -38,9 +38,9 @@
       </a>
 
       {% if setting %}
-        {% set actionPath = '/admin/global-notification/update' %}
+        {% set actionPath = '/admin/global-notification/' + setting.id + '/update' %}
       {% else %}
-        {% set actionPath = '/admin/global-notification/create' %}
+        {% set actionPath = '/admin/global-notification/new' %}
       {% endif %}
       <div class="m-t-20 form-box col-md-11">
         <form action="{{ actionPath }}" method="post" class="form-horizontal" role="form">

lib/views/admin/global-notification.html

@@ -1,4 +1,4 @@
-<a href="/admin/global-notification/detail">
+<a href="/admin/global-notification/new">
   <p class="btn btn-default">通知設定の追加</p>
 </a>
 <h2>通知設定一覧</h2>
@@ -21,7 +21,7 @@
     <th>Action</th>
   </thead>
   <tbody class="admin-notif-list">
-    {% set detailPageUrl = '/admin/global-notification/detail' %}
+    {% set detailPageUrl = '/admin/global-notification' %}
     {% for globalNotif in globalNotifications %}
     <tr class="clickable-row" data-href="{{ detailPageUrl }}" data-updatepost-id="{{ globalNotif._id.toString() }}">
       <td class="unclickable align-middle">
@@ -60,7 +60,7 @@
   $(".unclickable > .btn-delete").click(function(event) {
     var $targetRow = $(event.currentTarget).closest("tr");
     var id = $targetRow.data("updatepost-id");
-    $.post('/admin/global-notification/remove?id=' + id, function(res) {
+    $.post('/admin/global-notification/' + id + '/remove', function(res) {
       if (res.ok) {
         $targetRow.closest('tr').remove();
         $('.admin-notification > .row > .col-md-9').prepend(
@@ -92,7 +92,7 @@
     $.post('/_api/admin/global-notification/toggleIsEnabled?id=' + id + '&isEnabled=' + isEnabled, function(res) {
       if (res.ok) {
         $('.admin-notification > .row > .col-md-9').prepend(
-          '<div class=\"alert alert-success\">Successfully Upated</div>'
+          '<div class=\"alert alert-success\">Successfully Updated</div>'
         );
         $message = $('.admin-notification > .row > .col-md-9 > .alert.alert-success');
         setTimeout(function()