diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2016-09-26 17:33:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-26 17:33:22 +0200 |
| commit | 3e4a4cab3459e9ae8254878f97666ed49a411d80 (patch) | |
| tree | a41c51887de4eec01c10091564ea74e47d390798 /apps/workflowengine | |
| parent | 598b243838cf7bd738273b190753a7f6b0940773 (diff) | |
| parent | 968dc876b2df4d2c1412f230e4afc2f771d13880 (diff) | |
| download | nextcloud-server-3e4a4cab3459e9ae8254878f97666ed49a411d80.tar.gz nextcloud-server-3e4a4cab3459e9ae8254878f97666ed49a411d80.zip | |
Merge pull request #1510 from nextcloud/workflow-fix-handlebar-update
Fix selection of workflowengine rules and operators
Diffstat (limited to 'apps/workflowengine')
| -rw-r--r-- | apps/workflowengine/js/admin.js | 2 | ||||
| -rw-r--r-- | apps/workflowengine/js/filemimetypeplugin.js | 4 | ||||
| -rw-r--r-- | apps/workflowengine/js/requesturlplugin.js | 4 | ||||
| -rw-r--r-- | apps/workflowengine/js/requestuseragentplugin.js | 4 | ||||
| -rw-r--r-- | apps/workflowengine/templates/admin.php | 4 |
5 files changed, 9 insertions, 9 deletions
diff --git a/apps/workflowengine/js/admin.js b/apps/workflowengine/js/admin.js index 2c6fa54d87d..0357d741ab1 100644 --- a/apps/workflowengine/js/admin.js +++ b/apps/workflowengine/js/admin.js @@ -21,7 +21,7 @@ (function() { Handlebars.registerHelper('selectItem', function(currentValue, itemValue) { if(currentValue === itemValue) { - return 'selected=selected'; + return 'selected="selected"'; } return ""; diff --git a/apps/workflowengine/js/filemimetypeplugin.js b/apps/workflowengine/js/filemimetypeplugin.js index 9fc9e3452f4..fd3f6a9ae63 100644 --- a/apps/workflowengine/js/filemimetypeplugin.js +++ b/apps/workflowengine/js/filemimetypeplugin.js @@ -41,9 +41,9 @@ return; } - var placeholder = t('workflowengine', 'text/plain'); + var placeholder = 'text/plain'; if (check['operator'] === 'matches' || check['operator'] === '!matches') { - placeholder = t('workflowengine', '/^text\\/(plain|html)$/i'); + placeholder = '/^text\\/(plain|html)$/i'; if (this._validateRegex(check['value'])) { $(element).removeClass('invalid-input'); diff --git a/apps/workflowengine/js/requesturlplugin.js b/apps/workflowengine/js/requesturlplugin.js index 5f21d2a59fc..7c81deaaf33 100644 --- a/apps/workflowengine/js/requesturlplugin.js +++ b/apps/workflowengine/js/requesturlplugin.js @@ -42,10 +42,10 @@ return; } - var placeholder = t('workflowengine', 'https://localhost/index.php'); + var placeholder = 'https://localhost/index.php'; if (check['operator'] === 'matches' || check['operator'] === '!matches') { - placeholder = t('workflowengine', '/^https\\:\\/\\/localhost\\/index\\.php$/i'); + placeholder = '/^https\\:\\/\\/localhost\\/index\\.php$/i'; } $(element).css('width', '250px') diff --git a/apps/workflowengine/js/requestuseragentplugin.js b/apps/workflowengine/js/requestuseragentplugin.js index 8413d52ac43..42e3f6b13d2 100644 --- a/apps/workflowengine/js/requestuseragentplugin.js +++ b/apps/workflowengine/js/requestuseragentplugin.js @@ -42,10 +42,10 @@ return; } - var placeholder = t('workflowengine', 'Mozilla/5.0 User Agent'); + var placeholder = 'Mozilla/5.0 User Agent'; if (check['operator'] === 'matches' || check['operator'] === '!matches') { - placeholder = t('workflowengine', '/^Mozilla\\/5\\.0 (.?)$/i'); + placeholder = '/^Mozilla\\/5\\.0 (.?)$/i'; } $(element).css('width', '250px') diff --git a/apps/workflowengine/templates/admin.php b/apps/workflowengine/templates/admin.php index 8f0124c5cbe..500300f93b3 100644 --- a/apps/workflowengine/templates/admin.php +++ b/apps/workflowengine/templates/admin.php @@ -55,12 +55,12 @@ <div class="check" data-id="{{@index}}"> <select class="check-class"> {{#each ../classes}} - <option value="{{class}}" {{selectItem class ../class}}>{{name}}</option> + <option value="{{class}}" {{{selectItem class ../class}}}>{{name}}</option> {{/each}} </select> <select class="check-operator"> {{#each (getOperators class)}} - <option value="{{operator}}" {{selectItem operator ../operator}}>{{name}}</option> + <option value="{{operator}}" {{{selectItem operator ../operator}}}>{{name}}</option> {{/each}} </select> <input type="text" class="check-value" value="{{value}}"> |