mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #9393 from nextcloud/bugfix/noid/fix-workflow-rules 

Fix workflow rules
This commit is contained in:
blizzz 2018-05-07 14:57:55 +02:00 committed by GitHub
parent eb063fdb6e fc582d6253
commit ec0623045b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 343 additions and 340 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/workflowengine/js/admin.js
View File

@ -167,12 +167,12 @@
url: OC.linkToOCS('cloud/groups', 2) + 'details', url: OC.linkToOCS('cloud/groups', 2) + 'details',
dataType: 'json', dataType: 'json',
quietMillis: 100, quietMillis: 100,
}).success(function(response) { }).success(function(data) {
if (data.ocs.data.groups && data.ocs.data.groups.length > 0) { if (data.ocs.data.groups && data.ocs.data.groups.length > 0) {
data.ocs.data.groups.forEach(function(group) { data.ocs.data.groups.forEach(function(group) {
self.groups.push({ id: group.id, displayname: group.displayname }); self.groups.push({ id: group.id, displayname: group.displayname });
}) });
self.render(); self.render();
} else { } else {
@ -270,6 +270,7 @@
var check = OCA.WorkflowEngine.getCheckByClass(value); var check = OCA.WorkflowEngine.getCheckByClass(value);
if (!_.isUndefined(check)) { if (!_.isUndefined(check)) {
checks[id]['operator'] = check['operators'][0]['operator']; checks[id]['operator'] = check['operators'][0]['operator'];
checks[id]['value'] = '';
} }
} }
// model change will trigger render // model change will trigger render

2
apps/workflowengine/js/filesystemtagsplugin.js
View File

@ -63,7 +63,9 @@
}, },
formatSelection: function (tagId) { formatSelection: function (tagId) {
var tag = OC.SystemTags.collection.get(tagId); var tag = OC.SystemTags.collection.get(tagId);
if (!_.isUndefined(tag)) {
return OC.SystemTags.getDescriptiveTag(tag); return OC.SystemTags.getDescriptiveTag(tag);
}
}, },
escapeMarkup: function(m) { escapeMarkup: function(m) {
return m; return m;