mirror of
				https://github.com/firefly-iii/firefly-iii.git
				synced 2025-10-31 02:36:28 +00:00 
			
		
		
		
	Attempt at validating.
This commit is contained in:
		| @@ -101,8 +101,9 @@ class RuleController extends Controller | |||||||
|         // has old input? |         // has old input? | ||||||
|         if (Input::old()) { |         if (Input::old()) { | ||||||
|             // process old triggers. |             // process old triggers. | ||||||
|  |             $newIndex = 0; | ||||||
|             foreach (Input::old('rule-trigger') as $index => $entry) { |             foreach (Input::old('rule-trigger') as $index => $entry) { | ||||||
|                 $count = ($index + 1); |                 $count = ($newIndex + 1); | ||||||
|                 $triggerCount++; |                 $triggerCount++; | ||||||
|                 $oldTrigger    = $entry; |                 $oldTrigger    = $entry; | ||||||
|                 $oldValue      = Input::old('rule-trigger-value')[$index]; |                 $oldValue      = Input::old('rule-trigger-value')[$index]; | ||||||
| @@ -117,6 +118,7 @@ class RuleController extends Controller | |||||||
|                         'count'      => $count |                         'count'      => $count | ||||||
|                     ] |                     ] | ||||||
|                 )->render(); |                 )->render(); | ||||||
|  |                 $newIndex++; | ||||||
|             } |             } | ||||||
| //            echo '<pre>'; | //            echo '<pre>'; | ||||||
| //            var_dump(Input::old()); | //            var_dump(Input::old()); | ||||||
|   | |||||||
| @@ -49,7 +49,10 @@ class RuleFormRequest extends Request | |||||||
|             'description'     => 'between:1,5000', |             'description'     => 'between:1,5000', | ||||||
|             'stop_processing' => 'boolean', |             'stop_processing' => 'boolean', | ||||||
|             'trigger'         => 'required|in:store-journal,update-journal', |             'trigger'         => 'required|in:store-journal,update-journal', | ||||||
|             'rule-trigger.*'  => 'required|in:' . join(',', $validTriggers) |             'rule-trigger.*'  => 'required|in:' . join(',', $validTriggers), | ||||||
|  |             'rule-trigger-value.*'  => 'required|min:1' | ||||||
|  |  | ||||||
|  |              | ||||||
|         ]; |         ]; | ||||||
|     } |     } | ||||||
| } | } | ||||||
|   | |||||||
| @@ -11,7 +11,10 @@ | |||||||
| $(function () { | $(function () { | ||||||
|     "use strict"; |     "use strict"; | ||||||
|     console.log("edit"); |     console.log("edit"); | ||||||
|     addNewTrigger(); |     if (triggerCount == 0) { | ||||||
|  |         addNewTrigger(); | ||||||
|  |     } | ||||||
|  | 
 | ||||||
|     addNewAction(); |     addNewAction(); | ||||||
|     $('.add_rule_trigger').click(function () { |     $('.add_rule_trigger').click(function () { | ||||||
|         addNewTrigger(); |         addNewTrigger(); | ||||||
| @@ -19,7 +19,14 @@ | |||||||
|         </select> |         </select> | ||||||
|     </td> |     </td> | ||||||
|     <td> |     <td> | ||||||
|         <input type="text" value="{{ oldValue }}" name="rule-trigger-value[{{ count }}]" class="form-control"> |  | ||||||
|  |         <input type="text" value="{{ oldValue }}" name="rule-trigger-value[{{ count }}]" | ||||||
|  |                class="form-control"> | ||||||
|  |         {% if errors.has(('rule-trigger-value.'~count)) %} | ||||||
|  |         <p class="text-danger"> | ||||||
|  |             {{ errors.first('rule-trigger-value.'~count) }} | ||||||
|  |         </p> | ||||||
|  |         {% endif %} | ||||||
|     </td> |     </td> | ||||||
|     <td style="width:20%;"> |     <td style="width:20%;"> | ||||||
|         <div class="checkbox"> |         <div class="checkbox"> | ||||||
|   | |||||||
| @@ -42,9 +42,6 @@ | |||||||
|                     <h3 class="box-title">{{ 'rule_triggers'|_ }}</h3> |                     <h3 class="box-title">{{ 'rule_triggers'|_ }}</h3> | ||||||
|                 </div> |                 </div> | ||||||
|                 <!-- display any error --> |                 <!-- display any error --> | ||||||
|                 {% if errors.has('rule-trigger.1') %} |  | ||||||
|                     {{ errors.first('rule-trigger.1') }} |  | ||||||
|                 {% endif %} |  | ||||||
|                 <div class="box-body rule-trigger-box"> |                 <div class="box-body rule-trigger-box"> | ||||||
|                     <table class="table table-condensed table-bordered table-striped"> |                     <table class="table table-condensed table-bordered table-striped"> | ||||||
|                         <thead> |                         <thead> | ||||||
| @@ -128,5 +125,5 @@ | |||||||
|         var triggerCount = {{ triggerCount }}; |         var triggerCount = {{ triggerCount }}; | ||||||
|         var actionCount = {{ actionCount }}; |         var actionCount = {{ actionCount }}; | ||||||
|     </script> |     </script> | ||||||
|     <script type="text/javascript" src="js/rules/edit.js"></script> |     <script type="text/javascript" src="js/rules/create.js"></script> | ||||||
| {% endblock %} | {% endblock %} | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user