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
commit ec0623045b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 343 additions and 340 deletions

View File

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

View File

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