IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2024-12-27 17:31:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix test, expand index.

Browse Source
This commit is contained in:
James Cole 2016-01-14 09:17:23 +01:00
parent 33899f0e2f
commit 245f06c93a
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
database/seeds/TestDataSeeder.php
View File

@ -215,7 +215,7 @@ class TestDataSeeder extends Seeder
$rule = new Rule; $rule = new Rule;
$rule->user()->associate($this->user); $rule->user()->associate($this->user);
$rule->ruleGroup()->associate(RuleGroup::find(1)); $rule->ruleGroup()->associate(RuleGroup::find(1));
$rule->order = 2; $rule->order = 3;
$rule->active = 1; $rule->active = 1;
$rule->stop_processing = 0; $rule->stop_processing = 0;
$rule->title = 'Move savings'; $rule->title = 'Move savings';

19
resources/views/rules/index.twig
View File

@ -63,14 +63,25 @@
<tr> <tr>
<td> <td>
<div class="btn-group btn-group-xs"> <div class="btn-group btn-group-xs">
{% if rule.order > 1 %}
<a title="{{ 'rule_priority_up'|_ }}" href="{{ route('rules.rule.up', rule.id) }}" class="btn btn-default"><span <a title="{{ 'rule_priority_up'|_ }}" href="{{ route('rules.rule.up', rule.id) }}" class="btn btn-default"><span
class="fa fa-arrow-up"></span></a> class="fa fa-fw fa-arrow-up"></span></a>
{% else %}
<a href="#" class="btn btn-default"><span
class="fa fa-fw"></span></a>
{% endif %}
{% if rule.order < ruleGroup.rules.count %}
<a title="{{ 'rule_priority_down'|_ }}" href="{{ route('rules.rule.down', rule.id) }}" <a title="{{ 'rule_priority_down'|_ }}" href="{{ route('rules.rule.down', rule.id) }}"
class="btn btn-default"><span class="fa fa-arrow-down"></span></a> class="btn btn-default"><span class="fa fa-fw fa-arrow-down"></span>
</a>
{% else %}
<a href="#" class="btn btn-default"><span
class="fa fa-fw"></span></a>
{% endif %}
<a title="{{ 'edit'|_ }}" href="{{ route('rules.rule.edit', rule.id) }}" class="btn btn-default"><span <a title="{{ 'edit'|_ }}" href="{{ route('rules.rule.edit', rule.id) }}" class="btn btn-default"><span
class="fa fa-pencil"></span></a> class="fa fa-fw fa-pencil"></span></a>
<a title="{{ 'delete'|_ }}" href="{{ route('rules.rule.delete', rule.id) }}" class="btn btn-danger"><span <a title="{{ 'delete'|_ }}" href="{{ route('rules.rule.delete', rule.id) }}" class="btn btn-danger"><span
class="fa fa-trash"></span></a> class="fa fa-fw fa-trash"></span></a>
</div> </div>
</td> </td>