kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-22 20:16:22 +00:00
Code Issues Projects Releases Wiki Activity

Some more rule things before I merge a change to the CSV importer.

Browse Source
This commit is contained in:
James Cole
2016-01-14 19:20:02 +01:00
parent 42203ba872
commit 9703439a4c
6 changed files with 86 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,24 +3,37 @@
<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('XXX') %}
{% 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('xxxx') }}</p>
<p class="text-danger">{{ errors.first('rule-action.'~count) }}</p>
{% endif %}
<select name="rule-action[{{ count }}]" class="form-control">
{% for key,name in actions %}
<option value="{{ key }}" label="{{ name }}">{{ name }}</option>
<option value="{{ key }}" label="{{ name }}"
{% if key == oldTrigger %}
selected
{% endif %}
>{{ name }}</option>
{% endfor %}
</select>
</td>
<td>
<input type="text" name="rule-action-value[{{ count }}]" class="form-control">
<input type="text" value="{{ oldValue }}" name="rule-action-value[{{ count }}]"
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-action-stop[{{ count }}]" value="1"
{% if oldChecked %}checked{% endif %}
/>
</label>
</div>
</td>

4
resources/views/rules/rule/create.twig
View File

@@ -84,7 +84,9 @@
</tr>
</thead>
<tbody class="rule-action-tbody">
{% for action in oldActions %}
{{ action|raw }}
{% endfor %}
</tbody>
</table>