diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-05-09 08:41:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-09 08:41:58 +0200 |
| commit | fe2d99f3fbbfe7bdb4ad495b8459ae00814052ee (patch) | |
| tree | ff6fb07d79ff1d51886c216d047c413bb9f5f57f /apps | |
| parent | d8d09475c4e598aeb1c6f6bb958dfd7734434dc9 (diff) | |
| parent | a134bf7349bf8d94bdd0b617d33250d2fac45c73 (diff) | |
| download | nextcloud-server-fe2d99f3fbbfe7bdb4ad495b8459ae00814052ee.tar.gz nextcloud-server-fe2d99f3fbbfe7bdb4ad495b8459ae00814052ee.zip | |
Merge pull request #9409 from nextcloud/backport/9393/workflow-rules-error-when-changing-operation
[stable13] workflow rules error when changing operation
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/workflowengine/js/admin.js | 1 | ||||
| -rw-r--r-- | apps/workflowengine/js/filesystemtagsplugin.js | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/apps/workflowengine/js/admin.js b/apps/workflowengine/js/admin.js index ab122a8cd65..3a453befb8b 100644 --- a/apps/workflowengine/js/admin.js +++ b/apps/workflowengine/js/admin.js @@ -248,6 +248,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 diff --git a/apps/workflowengine/js/filesystemtagsplugin.js b/apps/workflowengine/js/filesystemtagsplugin.js index dc6f608d85a..e66a35b73b9 100644 --- a/apps/workflowengine/js/filesystemtagsplugin.js +++ b/apps/workflowengine/js/filesystemtagsplugin.js @@ -63,7 +63,9 @@ }, formatSelection: function (tagId) { var tag = OC.SystemTags.collection.get(tagId); - return OC.SystemTags.getDescriptiveTag(tag); + if (!_.isUndefined(tag)) { + return OC.SystemTags.getDescriptiveTag(tag); + } }, escapeMarkup: function(m) { return m; |