diff options
| -rw-r--r-- | .devcontainer/Dockerfile | 6 | ||||
| -rw-r--r-- | .devcontainer/devcontainer.json | 2 | ||||
| -rw-r--r-- | .devcontainer/docker-compose.yml | 5 | ||||
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | client/components/settings/peopleBody.js | 4 | ||||
| -rw-r--r-- | server/publications/people.js | 12 | ||||
| -rw-r--r-- | snapcraft.yaml | 5 |
7 files changed, 19 insertions, 16 deletions
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index f9b01d8f..ff9e6177 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -6,7 +6,7 @@ ENV DEBIAN_FRONTEND=noninteractive ENV \ DEBUG=false \ - NODE_VERSION=8.16.0 \ + NODE_VERSION=8.16.1 \ METEOR_RELEASE=1.8.1 \ USE_EDGE=false \ METEOR_EDGE=1.5-beta.17 \ @@ -144,11 +144,13 @@ RUN set -o xtrace \ && printf "\n[-] Installing Meteor $METEOR_VERSION...\n\n" \ && sh /home/wekan/install-meteor.sh -ENV PATH=$PATH:$HOME/.meteor/ +ENV PATH=$PATH:/home/wekan/.meteor/ # Copy source dir USER root +RUN echo "export PATH=$PATH" >> /etc/environment + RUN set -o xtrace \ && mkdir /home/wekan/app diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index f4e1367b..432e7c19 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ // See https://aka.ms/vscode-remote/devcontainer.json for format details. { - "dockerComposeFile": "docker-compose.yml", + "dockerComposeFile": ["docker-compose.yml", "docker-compose.extend.yml"], "service": "wekan-dev", "workspaceFolder": "/home/wekan/app", "extensions": [ diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index 7a5f8e10..fab77056 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -3,7 +3,7 @@ version: '3.7' services: wekandb-dev: - image: mongo:4.0.11 + image: mongo:4.0.12 container_name: wekan-dev-db restart: unless-stopped command: mongod --smallfiles --oplogSize 128 @@ -29,9 +29,6 @@ services: environment: - MONGO_URL=mongodb://wekandb-dev:27017/wekan - ROOT_URL=http://localhost:3000 - #- MAIL_URL=smtp://user:pass@mailserver.example.com:25/ - - MAIL_URL=smtp://<mail_url>:25/?ignoreTLS=true&tls={rejectUnauthorized:false} - - MAIL_FROM=Wekan Notifications <noreply.wekan@mydomain.com> - WITH_API=true - RICHER_CARD_COMMENT_EDITOR=true - BROWSER_POLICY_ENABLED=true @@ -31,3 +31,4 @@ ehthumbs.db .eslintcache .meteor/local .meteor-1.6-snap/.meteor/local +.devcontainer/docker-compose.extend.yml diff --git a/client/components/settings/peopleBody.js b/client/components/settings/peopleBody.js index a9f2247c..8610034e 100644 --- a/client/components/settings/peopleBody.js +++ b/client/components/settings/peopleBody.js @@ -17,7 +17,7 @@ BlazeComponent.extendComponent({ this.autorun(() => { const limit = this.page.get() * usersPerPage; - this.subscribe('people', limit, () => { + this.subscribe('people', this.findUsersOptions.get(), limit, () => { this.loadNextPageLocked = false; const nextPeakBefore = this.callFirstWith(null, 'getNextPeak'); this.calculateNextPeak(); @@ -85,7 +85,7 @@ BlazeComponent.extendComponent({ const users = Users.find(this.findUsersOptions.get(), { fields: { _id: true }, }); - this.number.set(users.count()); + this.number.set(users.count(false)); return users; }, peopleNumber() { diff --git a/server/publications/people.js b/server/publications/people.js index cc8e3fc9..dbde8a61 100644 --- a/server/publications/people.js +++ b/server/publications/people.js @@ -1,4 +1,5 @@ -Meteor.publish('people', function(limit) { +Meteor.publish('people', function(query, limit) { + check(query, Match.OneOf(Object, null)); check(limit, Number); if (!Match.test(this.userId, String)) { @@ -8,7 +9,7 @@ Meteor.publish('people', function(limit) { const user = Users.findOne(this.userId); if (user && user.isAdmin) { return Users.find( - {}, + query, { limit, sort: { createdAt: -1 }, @@ -21,9 +22,8 @@ Meteor.publish('people', function(limit) { loginDisabled: 1, authenticationMethod: 1, }, - }, - ); - } else { - return []; + }); } + + return []; }); diff --git a/snapcraft.yaml b/snapcraft.yaml index 9c82c6d0..b74e7463 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -210,6 +210,9 @@ parts: #meteor npm install --save bcrypt # Change back to Wekan source directory cd ../../../.. + # Remove package-lock.json so that set-version below would not claim Wekan is dirty + rm -f package-lock.json + # Copy files to snap cp -r .build/bundle/* $SNAPCRAFT_PART_INSTALL/ cp .build/bundle/.node_version.txt $SNAPCRAFT_PART_INSTALL/ # Delete phantomjs @@ -222,9 +225,9 @@ parts: rm -f $SNAPCRAFT_PART_INSTALL/lib/node_modules/wekan/.build/bundle/programs/server/npm/node_modules/tar/lib/.mkdir.js.swp rm -f $SNAPCRAFT_PART_INSTALL/lib/node_modules/wekan/.build/bundle/programs/server/node_modules/node-pre-gyp/node_modules/tar/lib/.mkdir.js.swp rm -f $SNAPCRAFT_PART_INSTALL/lib/node_modules/wekan/node_modules/tar/lib/.mkdir.js.swp - rm -f $SNAPCRAFT_PART_INSTALL/programs/server/npm/node_modules/tar/lib/.mkdir.js.swp rm -f $SNAPCRAFT_PART_INSTALL/lib/node_modules/node-pre-gyp/node_modules/tar/lib/.mkdir.js.swp rm -f $SNAPCRAFT_PART_INSTALL/lib/node_modules/node-gyp/node_modules/tar/lib/.mkdir.js.swp + rm -f $SNAPCRAFT_PART_INSTALL/programs/server/npm/node_modules/tar/lib/.mkdir.js.swp # Meteor 1.8.x additional .swp remove rm -f $SNAPCRAFT_PART_INSTALL/programs/server/node_modules/node-pre-gyp/node_modules/tar/lib/.mkdir.js.swp # Wekan version |