Browse Source

Merge branch 'search' of supplee.net:wekan into search

John R. Supplee 4 years ago
parent
commit
db9ee59d9f
3 changed files with 6 additions and 1 deletions
  1. 1 1
      i18n/en.i18n.json
  2. 5 0
      server/publications/cards.js
  3. 0 0
      snap-src/bin/config

+ 1 - 1
i18n/en.i18n.json

@@ -980,7 +980,7 @@
   "cardsSortPopup-title": "Sort Cards",
   "due-date": "Due Date",
   "server-error": "Server Error",
-  "server-error-troubleshooting": "Please submit the error generated by the server.\nFor a snap installation on Linux, run: `sudo journalctl -u 'snap.wekan.*'`",
+  "server-error-troubleshooting": "Please submit the error generated by the server.\nFor a snap installation, run: `sudo snap logs wekan.wekan`\nFor a Docker installation, run: `sudo docker logs wekan-app`",
   "title-alphabetically": "Title (Alphabetically)",
   "created-at-newest-first": "Created At (Newest First)",
   "created-at-oldest-first": "Created At (Oldest First)",

+ 5 - 0
server/publications/cards.js

@@ -461,6 +461,11 @@ function buildProjection(query) {
     skip = query.params.skip;
   }
   let limit = DEFAULT_LIMIT;
+  const configLimit = parseInt(process.env.RESULTS_PER_PAGE, 10);
+  if (!isNaN(configLimit) && configLimit > 0) {
+    limit = configLimit;
+  }
+
   if (query.params.hasOperator(OPERATOR_LIMIT)) {
     limit = query.params.getPredicate(OPERATOR_LIMIT);
   }

File diff suppressed because it is too large
+ 0 - 0
snap-src/bin/config


Some files were not shown because too many files changed in this diff