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

Merge pull request #9409 from nextcloud/backport/9393/workflow-rules-error-when-changing-operation 

[stable13] workflow rules error when changing operation
This commit is contained in:
Morris Jobke 2018-05-09 08:41:58 +02:00 committed by GitHub
parent d8d09475c4 a134bf7349
commit fe2d99f3fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -248,6 +248,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

4
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);
return OC.SystemTags.getDescriptiveTag(tag); if (!_.isUndefined(tag)) {
return OC.SystemTags.getDescriptiveTag(tag);
}
}, },
escapeMarkup: function(m) { escapeMarkup: function(m) {
return m; return m;