Shun Miyazawa 3 years ago
parent
commit
334c1141aa
2 changed files with 9 additions and 7 deletions
  1. 2 2
      packages/app/src/server/routes/index.js
  2. 7 5
      packages/app/src/server/routes/page.js

+ 2 - 2
packages/app/src/server/routes/index.js

@@ -246,7 +246,7 @@ module.exports = function(crowi, app) {
 
   app.get('/:id([0-9a-z]{24})'       , loginRequired , addActivity, injectUserUISettings, page.showPage);
 
-  app.get('/*/$'                   , loginRequired , injectUserUISettings, page.redirectorWithEndOfSlash);
-  app.get('/*'                     , loginRequired , autoReconnectToSearch, injectUserUISettings, page.redirector);
+  app.get('/*/$'                   , loginRequired , addActivity, injectUserUISettings, page.redirectorWithEndOfSlash);
+  app.get('/*'                     , loginRequired , addActivity, autoReconnectToSearch, injectUserUISettings, page.redirector);
 
 };

+ 7 - 5
packages/app/src/server/routes/page.js

@@ -475,11 +475,7 @@ module.exports = function(crowi, app) {
 
     await interceptorManager.process('beforeRenderPage', req, res, renderVars);
 
-    const parameters = {
-      targetModel: SUPPORTED_TARGET_MODEL_TYPE.MODEL_PAGE,
-      target: page,
-      action: SUPPORTED_ACTION_TYPE.ACTION_PAGE_VIEW,
-    };
+    const parameters = { action: SUPPORTED_ACTION_TYPE.ACTION_PAGE_VIEW };
     activityEvent.emit('update', res.locals.activity._id, parameters);
 
     return res.render(view, renderVars);
@@ -661,6 +657,9 @@ module.exports = function(crowi, app) {
   actions.redirector = async function(req, res, next) {
     const path = getPathFromRequest(req);
 
+    const parameters = { action: SUPPORTED_ACTION_TYPE.ACTION_PAGE_VIEW };
+    activityEvent.emit('update', res.locals.activity._id, parameters);
+
     return redirector(req, res, next, path);
   };
 
@@ -668,6 +667,9 @@ module.exports = function(crowi, app) {
     const _path = getPathFromRequest(req);
     const path = pathUtils.removeTrailingSlash(_path);
 
+    const parameters = { action: SUPPORTED_ACTION_TYPE.ACTION_PAGE_VIEW };
+    activityEvent.emit('update', res.locals.activity._id, parameters);
+
     return redirector(req, res, next, path);
   };