Skip to content

Commit 1fe50a3

Browse files
committed
fix EntityRestriction copyperm filter
1 parent e851588 commit 1fe50a3

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

OpenFlow/src/DatabaseConnection.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2027,7 +2027,7 @@ export class DatabaseConnection {
20272027
let result: boolean = false;
20282028
const authorized = this.EntityRestrictions.filter(x => x.IsAuthorized(user) && (x.collection == collection || x.collection == ""));
20292029
const matches = authorized.filter(x => x.IsMatch(item) && (x.collection == collection || x.collection == ""));
2030-
const copyperm = authorized.filter(x => x.copyperm && (x.collection == collection || x.collection == ""));
2030+
const copyperm = matches.filter(x => x.copyperm && (x.collection == collection || x.collection == ""));
20312031
if (!defaultAllow && matches.length == 0) return false; // no hits, if not allowed return false
20322032
if (matches.length > 0) result = true;
20332033

gulpfile.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -188,12 +188,12 @@ gulp.task("compose", shell.task([
188188
// 'docker push openiap/openflow:' + version,
189189
'docker push openiap/openflow:edge1.3',
190190

191-
// 'echo "Build openiap/nodered"',
192-
// 'cd OpenFlowNodeRED && docker build -t openiap/nodered:edge .',
193-
// // 'docker tag openiap/nodered:edge openiap/nodered:' + version,
194-
// 'echo "Push openiap/nodered"',
195-
// 'docker push openiap/nodered:edge',
196-
// // 'docker push openiap/nodered:' + version,
191+
'echo "Build openiap/nodered"',
192+
'cd OpenFlowNodeRED && docker build -t openiap/nodered:edge .',
193+
// 'docker tag openiap/nodered:edge openiap/nodered:' + version,
194+
'echo "Push openiap/nodered"',
195+
'docker push openiap/nodered:edge',
196+
// 'docker push openiap/nodered:' + version,
197197

198198
// 'echo "Build openiap/nodered-puppeteer"',
199199
// 'cd OpenFlowNodeRED && docker build -t openiap/nodered-puppeteer:edge -f Dockerfilepuppeteer .',

0 commit comments

Comments
 (0)