diff --git a/.meteor/packages b/.meteor/packages
index 4af5ec1..5346828 100644
--- a/.meteor/packages
+++ b/.meteor/packages
@@ -6,18 +6,18 @@
meteor-base@1.5.2 # Packages every Meteor app needs to have
mobile-experience@1.1.2 # Packages for a great mobile UX
-mongo@2.1.2 # The database Meteor supports right now
+mongo@2.1.4 # The database Meteor supports right now
blaze-html-templates # Compile .html files into Meteor Blaze views
jquery # Wrapper package for npm-installed jquery
reactive-var@1.0.13 # Reactive variable for tracker
tracker@1.3.4 # Meteor's client-side reactive programming library
standard-minifier-css@1.9.3 # CSS minifier run for production mode
-standard-minifier-js@3.1.0 # JS minifier run for production mode
+standard-minifier-js@3.1.1 # JS minifier run for production mode
es5-shim@4.8.1 # ECMAScript 5 compatibility for older browsers
-ecmascript@0.16.11 # Enable ECMAScript2015+ syntax in app code
-typescript@5.6.4 # Enable TypeScript syntax in .ts and .tsx modules
-shell-server@0.6.1 # Server-side component of the `meteor shell` command
+ecmascript@0.16.13 # Enable ECMAScript2015+ syntax in app code
+typescript@5.6.6 # Enable TypeScript syntax in .ts and .tsx modules
+shell-server@0.6.2 # Server-side component of the `meteor shell` command
hot-module-replacement@0.5.4 # Update code in development without reloading the page
blaze-hot # Update files using Blaze's API with HMR
@@ -27,4 +27,4 @@ session@1.2.2
email@3.1.2
arianjahiri:meteor-handlebars-helpers
ostrio:flow-router-extra
-accounts-password@3.2.0
+accounts-password@3.2.1
diff --git a/.meteor/release b/.meteor/release
index d515fb7..4876d6f 100644
--- a/.meteor/release
+++ b/.meteor/release
@@ -1 +1 @@
-METEOR@3.3
+METEOR@3.3.2
diff --git a/.meteor/versions b/.meteor/versions
index 17cd573..9d06cad 100644
--- a/.meteor/versions
+++ b/.meteor/versions
@@ -1,9 +1,9 @@
-accounts-base@3.1.1
-accounts-password@3.2.0
+accounts-base@3.1.2
+accounts-password@3.2.1
allow-deny@2.1.0
arianjahiri:meteor-handlebars-helpers@0.0.1
autoupdate@2.0.1
-babel-compiler@7.12.0
+babel-compiler@7.12.2
babel-runtime@1.5.2
base64@1.0.13
binary-heap@1.0.12
@@ -11,10 +11,10 @@ blaze@3.0.2
blaze-hot@2.0.0
blaze-html-templates@3.0.0
blaze-tools@2.0.0
-boilerplate-generator@2.0.1
+boilerplate-generator@2.0.2
caching-compiler@2.0.1
caching-html-compiler@2.0.0
-callback-hook@1.6.0
+callback-hook@1.6.1
check@1.4.4
core-runtime@1.0.0
ddp@1.4.2
@@ -25,7 +25,7 @@ ddp-server@3.1.2
deps@1.0.5-pre.1
diff-sequence@1.1.3
dynamic-import@0.7.4
-ecmascript@0.16.11
+ecmascript@0.16.13
ecmascript-runtime@0.8.3
ecmascript-runtime-client@0.12.3
ecmascript-runtime-server@0.11.1
@@ -48,19 +48,19 @@ logging@1.3.6
meteor@2.1.1
meteor-base@1.5.2
minifier-css@2.0.1
-minifier-js@3.0.2
-minimongo@2.0.2
+minifier-js@3.0.4
+minimongo@2.0.4
mobile-experience@1.1.2
mobile-status-bar@1.1.1
-modern-browsers@0.2.2
+modern-browsers@0.2.3
modules@0.20.3
modules-runtime@0.13.2
modules-runtime-hot@0.14.3
-mongo@2.1.2
+mongo@2.1.4
mongo-decimal@0.2.0
mongo-dev-server@1.1.1
mongo-id@1.0.9
-npm-mongo@6.10.2
+npm-mongo@6.16.1
observe-sequence@2.0.0
ordered-dict@1.2.0
ostrio:flow-router-extra@3.12.0
@@ -76,18 +76,18 @@ roles@1.0.1
routepolicy@1.1.2
session@1.2.2
sha@1.0.10
-shell-server@0.6.1
+shell-server@0.6.2
socket-stream-client@0.6.1
spacebars@2.0.0
spacebars-compiler@2.0.0
standard-minifier-css@1.9.3
-standard-minifier-js@3.1.0
+standard-minifier-js@3.1.1
templating@1.4.4
templating-compiler@2.0.0
templating-runtime@2.0.1
templating-tools@2.0.0
tracker@1.3.4
-typescript@5.6.4
+typescript@5.6.6
underscore@1.6.4
url@1.3.5
webapp@2.0.7
diff --git a/client/General/DeleteConfModal/deleteConfirmationModal.js b/client/General/DeleteConfModal/deleteConfirmationModal.js
index 2d9d52a..f153ae7 100644
--- a/client/General/DeleteConfModal/deleteConfirmationModal.js
+++ b/client/General/DeleteConfModal/deleteConfirmationModal.js
@@ -25,9 +25,9 @@ Template.deleteConfirmationModal.events({
const delItem = async() => {
let result = await Meteor.callAsync(method, deleteId);
if (!result) {
- // console.log(" ERROR deleting item from modal: " + err);
+ console.log(" ERROR deleting item from modal: " + err);
} else {
- // console.log(" SUCCESSFULLY deleted.");
+ console.log(" SUCCESSFULLY deleted.");
// put the new modal open / close here
// $('#modalDelete').modal('close');
}
diff --git a/client/General/headerBar.html b/client/General/headerBar.html
index f3cd1fa..97737ca 100644
--- a/client/General/headerBar.html
+++ b/client/General/headerBar.html
@@ -11,7 +11,7 @@
My Lists
My Tasks
- My Settings
+ My Settings
{{#if isInRole "systemadmin"}}
Manage
{{/if}}
@@ -30,7 +30,7 @@
My Lists
My Tasks
- My Settings
+ My Settings
{{#if isInRole 'systemadmin'}}
Manage
{{#if $eq updateExists true}}
diff --git a/client/ListItems/listItemsTbl.js b/client/ListItems/listItemsTbl.js
index 1ff8aae..4d04e18 100644
--- a/client/ListItems/listItemsTbl.js
+++ b/client/ListItems/listItemsTbl.js
@@ -62,13 +62,15 @@ Template.listItemsTbl.events({
},
'click .markListItemReceived' (event) {
event.preventDefault();
- Meteor.call('setReceived.listItem', this._id, function(err, result) {
- if (err) {
- // console.log(" ERROR setting item as received: " + err);
+ const setRcvd = async() => {
+ let result = await Meteor.callAsync('setReceived.listItem', this._id);
+ if (!result) {
+ // console.log("Item not marked properly - why?");
} else {
- // console.log(" SUCCESS setting item received.");
+ // console.log("Item Marked Received.");
}
- });
+ }
+ setRcvd();
},
'click .deleteListItem' (event) {
event.preventDefault();
diff --git a/imports/api/menuProdLinks.js b/imports/api/menuProdLinks.js
index 70bded5..3dba4fc 100644
--- a/imports/api/menuProdLinks.js
+++ b/imports/api/menuProdLinks.js
@@ -52,6 +52,7 @@ Meteor.methods({
throw new Meteor.Error('You are not allowed to add menu and product links. Make sure you are logged in with valid user credentials.');
};
+ console.log(" ---- Doing an Update instead! ---- ");
return await MenuProdLinks.updateAsync({ menuItemId: menuItemId }, {
$set: {
products: prodNameArray,
diff --git a/package-lock.json b/package-lock.json
index 0d65189..a78ea76 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16,9 +16,9 @@
}
},
"node_modules/@babel/runtime": {
- "version": "7.27.6",
- "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.27.6.tgz",
- "integrity": "sha512-vbavdySgbTTrmFE+EsiqUTzlOr5bzlnJtUv9PynGCAKvfQqjIXbvFdumPM/GxMDfyuGMJaJAU6TO4zc1Jf1i8Q==",
+ "version": "7.28.4",
+ "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.28.4.tgz",
+ "integrity": "sha512-Q/N6JNWvIvPnLDvjlE1OUBLPQHH6l3CltCEsHIujp45zQUSSh8K+gHnaEX45yAT1nyngnINhvWtzN+Nb9D8RAQ==",
"license": "MIT",
"engines": {
"node": ">=6.9.0"
@@ -109,9 +109,9 @@
"license": "MIT"
},
"node_modules/meteor-node-stubs": {
- "version": "1.2.19",
- "resolved": "https://registry.npmjs.org/meteor-node-stubs/-/meteor-node-stubs-1.2.19.tgz",
- "integrity": "sha512-lryhEAPp7aysrC0j3XU1yTs92ktPQQhzQzLVz3OGQEZjL//iLhvJyeYNSvV01XJn6fXUXe48agossxniJkzYOQ==",
+ "version": "1.2.24",
+ "resolved": "https://registry.npmjs.org/meteor-node-stubs/-/meteor-node-stubs-1.2.24.tgz",
+ "integrity": "sha512-tw9QzDFVOI5A5CcEw4tTD6CjF+Lk14uzhy2gWH5ImoH4mx4pyPVcha9MmyVur+rEVgpzk+aMG6rs3RxAF9SwiA==",
"bundleDependencies": [
"@meteorjs/crypto-browserify",
"assert",
@@ -154,6 +154,7 @@
"punycode": "^1.4.1",
"querystring-es3": "^0.2.1",
"readable-stream": "^3.6.2",
+ "sha.js": "^2.4.12",
"stream-browserify": "^3.0.0",
"stream-http": "^3.2.0",
"string_decoder": "^1.3.0",
@@ -188,6 +189,11 @@
"node": ">= 0.12"
}
},
+ "node_modules/meteor-node-stubs/node_modules/@meteorjs/browserify-sign/node_modules/isarray": {
+ "version": "1.0.0",
+ "inBundle": true,
+ "license": "MIT"
+ },
"node_modules/meteor-node-stubs/node_modules/@meteorjs/browserify-sign/node_modules/readable-stream": {
"version": "2.3.8",
"inBundle": true,
@@ -906,7 +912,7 @@
}
},
"node_modules/meteor-node-stubs/node_modules/isarray": {
- "version": "1.0.0",
+ "version": "2.0.5",
"inBundle": true,
"license": "MIT"
},
@@ -1040,20 +1046,49 @@
"license": "MIT"
},
"node_modules/meteor-node-stubs/node_modules/pbkdf2": {
- "version": "3.1.2",
+ "version": "3.1.3",
"inBundle": true,
"license": "MIT",
"dependencies": {
- "create-hash": "^1.1.2",
- "create-hmac": "^1.1.4",
- "ripemd160": "^2.0.1",
- "safe-buffer": "^5.0.1",
- "sha.js": "^2.4.8"
+ "create-hash": "~1.1.3",
+ "create-hmac": "^1.1.7",
+ "ripemd160": "=2.0.1",
+ "safe-buffer": "^5.2.1",
+ "sha.js": "^2.4.11",
+ "to-buffer": "^1.2.0"
},
"engines": {
"node": ">=0.12"
}
},
+ "node_modules/meteor-node-stubs/node_modules/pbkdf2/node_modules/create-hash": {
+ "version": "1.1.3",
+ "inBundle": true,
+ "license": "MIT",
+ "dependencies": {
+ "cipher-base": "^1.0.1",
+ "inherits": "^2.0.1",
+ "ripemd160": "^2.0.0",
+ "sha.js": "^2.4.0"
+ }
+ },
+ "node_modules/meteor-node-stubs/node_modules/pbkdf2/node_modules/hash-base": {
+ "version": "2.0.2",
+ "inBundle": true,
+ "license": "MIT",
+ "dependencies": {
+ "inherits": "^2.0.1"
+ }
+ },
+ "node_modules/meteor-node-stubs/node_modules/pbkdf2/node_modules/ripemd160": {
+ "version": "2.0.1",
+ "inBundle": true,
+ "license": "MIT",
+ "dependencies": {
+ "hash-base": "^2.0.0",
+ "inherits": "^2.0.1"
+ }
+ },
"node_modules/meteor-node-stubs/node_modules/possible-typed-array-names": {
"version": "1.1.0",
"inBundle": true,
@@ -1215,15 +1250,22 @@
"license": "MIT"
},
"node_modules/meteor-node-stubs/node_modules/sha.js": {
- "version": "2.4.11",
+ "version": "2.4.12",
"inBundle": true,
"license": "(MIT AND BSD-3-Clause)",
"dependencies": {
- "inherits": "^2.0.1",
- "safe-buffer": "^5.0.1"
+ "inherits": "^2.0.4",
+ "safe-buffer": "^5.2.1",
+ "to-buffer": "^1.2.0"
},
"bin": {
"sha.js": "bin.js"
+ },
+ "engines": {
+ "node": ">= 0.10"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
}
},
"node_modules/meteor-node-stubs/node_modules/side-channel": {
@@ -1333,11 +1375,37 @@
"node": ">=0.6.0"
}
},
+ "node_modules/meteor-node-stubs/node_modules/to-buffer": {
+ "version": "1.2.1",
+ "inBundle": true,
+ "license": "MIT",
+ "dependencies": {
+ "isarray": "^2.0.5",
+ "safe-buffer": "^5.2.1",
+ "typed-array-buffer": "^1.0.3"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ }
+ },
"node_modules/meteor-node-stubs/node_modules/tty-browserify": {
"version": "0.0.1",
"inBundle": true,
"license": "MIT"
},
+ "node_modules/meteor-node-stubs/node_modules/typed-array-buffer": {
+ "version": "1.0.3",
+ "inBundle": true,
+ "license": "MIT",
+ "dependencies": {
+ "call-bound": "^1.0.3",
+ "es-errors": "^1.3.0",
+ "is-typed-array": "^1.1.14"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ }
+ },
"node_modules/meteor-node-stubs/node_modules/url": {
"version": "0.11.4",
"inBundle": true,
diff --git a/server/publish.js b/server/publish.js
index 61750dd..57e5e13 100644
--- a/server/publish.js
+++ b/server/publish.js
@@ -30,7 +30,7 @@ Meteor.publish("SystemConfig", function() {
Meteor.publish("UserConfigPrefs", function() {
try {
- return UserConfig.find({});
+ return UserConfig.find({ user: this.userId });
} catch (error) {
console.log(" ERROR: Error accessing user config: " + error);
}