kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-12-12 01:42:32 +00:00
Code Issues Projects Releases Wiki Activity

Refactor rule creation.

Browse Source
This commit is contained in:
James Cole
2018-08-05 15:34:20 +02:00
parent 07a8c69ba8
commit 422e80530b
12 changed files with 337 additions and 337 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
resources/views/rules/partials/action.twig
View File

@@ -3,12 +3,14 @@
<a href="#" class="btn btn-danger btn-sm remove-action"><i class="fa fa-trash"></i></a>
</td>
<td style="width:30%;">
{#
{% if errors.has('rule-action.'~count) %}
<span class="form-control-feedback"><i class="fa fa-fw fa-remove"></i></span>
<p class="text-danger">{{ errors.first('rule-action.'~count) }}</p>
{% endif %}
#}
<select name="rule-action[{{ count }}]" class="form-control">
<select name="rule_actions[{{ count }}][name]" class="form-control">
{% for key,name in allRuleActions() %}
<option value="{{ key }}" label="{{ name }}" {% if key == oldAction %} selected{% endif %}>{{ name }}</option>
{% endfor %}
@@ -16,18 +18,20 @@
</td>
<td>
<input autocomplete="off" type="text" value="{{ oldValue }}" name="rule-action-value[{{ count }}]"
<input autocomplete="off" type="text" value="{{ oldValue }}" name="rule_actions[{{ count }}][value]"
class="form-control">
{#
{% if errors.has(('rule-action-value.'~count)) %}
<p class="text-danger">
{{ errors.first('rule-action-value.'~count) }}
</p>
{% endif %}
#}
</td>
<td style="width:20%;">
<div class="checkbox">
<label>
<input type="checkbox" name="rule-action-stop[{{ count }}]" value="1"
<input type="checkbox" name="rule_actions[{{ count }}][stop_processing]" value="1"
{% if oldChecked %}checked{% endif %}
/>
</label>

11
resources/views/rules/partials/trigger.twig
View File

@@ -3,12 +3,14 @@
<a href="#" class="btn btn-danger btn-sm remove-trigger"><i class="fa fa-trash"></i></a>
</td>
<td style="width:30%;">
{#
{% if errors.has('rule-trigger.'~count) %}
<span class="form-control-feedback"><i class="fa fa-fw fa-remove"></i></span>
<p class="text-danger">{{ errors.first('rule-trigger.'~count) }}</p>
{% endif %}
#}
<select name="rule-trigger[{{ count }}]" class="form-control">
<select name="rule_triggers[{{ count }}][name]" class="form-control">
{% for key,name in allRuleTriggers() %}
<option value="{{ key }}" label="{{ name }}"
{% if key == oldTrigger %}
@@ -20,18 +22,19 @@
</td>
<td style="position: relative;">
<input autocomplete="off" type="text" value="{{ oldValue }}" name="rule-trigger-value[{{ count }}]"
class="form-control">
<input autocomplete="off" type="text" value="{{ oldValue }}" name="rule_triggers[{{ count }}][value]" class="form-control">
{#
{% if errors.has(('rule-trigger-value.'~count)) %}
<p class="text-danger">
{{ errors.first('rule-trigger-value.'~count) }}
</p>
{% endif %}
#}
</td>
<td style="width:20%;">
<div class="checkbox">
<label>
<input type="checkbox" name="rule-trigger-stop[{{ count }}]" value="1"
<input type="checkbox" name="rule_triggers[{{ count }}][stop_processing]" value="1"
{% if oldChecked %}checked{% endif %}
/>
</label>