Selaa lähdekoodia

fix #1875 add admin as access type

Shinsuke Sugaya 6 vuotta sitten
vanhempi
commit
c1d02a2c98

+ 2 - 0
src/main/java/org/codelibs/fess/Constants.java

@@ -259,6 +259,8 @@ public class Constants extends CoreLibConstants {
 
     public static final String SEARCH_LOG_ACCESS_TYPE_WEB = "web";
 
+    public static final String SEARCH_LOG_ACCESS_TYPE_ADMIN = "admin";
+
     public static final String SEARCH_LOG_ACCESS_TYPE_OTHER = "other";
 
     public static final String RESULTS_PER_PAGE = "resultsPerPage";

+ 1 - 0
src/main/java/org/codelibs/fess/app/web/admin/searchlist/AdminSearchlistAction.java

@@ -128,6 +128,7 @@ public class AdminSearchlistAction extends FessAdminAction {
         }
         final WebRenderData renderData = new WebRenderData();
         form.initialize();
+        request.setAttribute(Constants.SEARCH_LOG_ACCESS_TYPE, Constants.SEARCH_LOG_ACCESS_TYPE_ADMIN);
         try {
             searchService.search(form, renderData, getUserBean());
             return asListHtml().renderWith(data -> {

+ 2 - 0
src/main/java/org/codelibs/fess/helper/SearchLogHelper.java

@@ -128,6 +128,8 @@ public class SearchLogHelper {
             searchLog.setAccessType(Constants.SEARCH_LOG_ACCESS_TYPE_GSA);
         } else if (Constants.SEARCH_LOG_ACCESS_TYPE_OTHER.equals(accessType)) {
             searchLog.setAccessType(Constants.SEARCH_LOG_ACCESS_TYPE_OTHER);
+        } else if (Constants.SEARCH_LOG_ACCESS_TYPE_ADMIN.equals(accessType)) {
+            searchLog.setAccessType(Constants.SEARCH_LOG_ACCESS_TYPE_ADMIN);
         } else {
             searchLog.setAccessType(Constants.SEARCH_LOG_ACCESS_TYPE_WEB);
         }