Web interface. Stable. Minor changes. fintech-fab#12

truetamtam · Aug 29, 2014 · 6f16fed · 6f16fed
1 parent 24e5b88
commit 6f16fed
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/workbench/fintech-fab/actions-calc/src/controllers/RuleController.php b/workbench/fintech-fab/actions-calc/src/controllers/RuleController.php
@@ -49,7 +49,7 @@ public function create()
 		return json_encode([
 			'status'  => 'success',
 			'message' => 'Новое правило создано.',
-			'data'    => ['count' => $oEvent->count('id')]
+			'data' => ['count' => $oEvent::whereEventId($oRequestData['event_id'])->count()]
 		]);
 	}
 
@@ -103,7 +103,8 @@ public function delete($id)
 		}
 
 		if ($rule->delete()) {
-			$iRulesCount = $rule->count('id');
+
+			$iRulesCount = $rule::whereEventId($rule->event_id)->count();
 
 			return json_encode([
 				'status'  => 'success',

diff --git a/workbench/fintech-fab/actions-calc/src/views/calculator/_events.php b/workbench/fintech-fab/actions-calc/src/views/calculator/_events.php
@@ -785,7 +785,7 @@ function typeFromString(string) {
  * @param $th
  * @param oData
  */
-function updRulesCountFromRules($th, oData) {
+function updRulesCountFromRules($th, oData) { // TODO: bug adding to different rules.
 	var $eventId = $th.closest('tr.event-rules-row').data('event-rules');
 	var $ruleRow = $('#events-rules').find('tr[data-id=' + $eventId + ']');
 	var $seeRules = $ruleRow.find('button.see-rules');