Skip to content

Generate the checks list in JS #582

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nickvergessen merged 5 commits into from
Jul 27, 2016
Merged

Generate the checks list in JS #582

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7588f64
Generate the checks list in JS
nickvergessen Jul 26, 2016
681eebc
Remove php side of check registration
nickvergessen Jul 27, 2016
a3d1cd4
Fix morris comments
nickvergessen Jul 27, 2016
d47b7bd
Fix default value of operator
nickvergessen Jul 27, 2016
29a9cb7
Allow to reuse the template
nickvergessen Jul 27, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix morris comments
  • Loading branch information
@nickvergessen
nickvergessen committed Jul 27, 2016
commit a3d1cd4ad224059d3bc512b5591356d384d70f4c
7 changes: 2 additions & 5 deletions apps/workflowengine/js/admin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
return [];
});

OCA.WorkflowEngine = OCA.WorkflowEngine || {
OCA.WorkflowEngine = _.extend(OCA.WorkflowEngine || {}, {
availablePlugins: [],
availableChecks: [],

Expand All @@ -48,7 +48,7 @@
}
return undefined;
}
};
});

/**
* 888b d888 888 888
Expand Down Expand Up @@ -337,9 +337,6 @@
_initialize: function(classname) {
OCA.WorkflowEngine.availablePlugins = OC.Plugins.getPlugins('OCA.WorkflowEngine.CheckPlugins');
_.each(OCA.WorkflowEngine.availablePlugins, function(plugin) {
if (_.isFunction(plugin.initialize)) {
plugin.initialize();
}
if (_.isFunction(plugin.getCheck)) {
OCA.WorkflowEngine.availableChecks.push(plugin.getCheck());
}
Expand Down
2 changes: 1 addition & 1 deletion apps/workflowengine/templates/admin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
</select>
<select class="check-operator">
{{#each (getOperators class)}}
<option value="{{operator}}" {{selectItem this.operator ../operator}}>{{name}}</option>
<option value="{{operator}}" {{selectItem operator ../operator}}>{{name}}</option>
{{/each}}
</select>
<input type="text" class="check-value" value="{{value}}">
Expand Down