Revert "Copy actionable plugin improvements from quakemap.org install…

…ation (https://github.com/himalayantechies/Ushahidi_Web)" This reverts commit cab4177.
AyudaEcuador · Apr 26, 2016 · 029542e · 029542e
1 parent 41341e4
commit 029542e
Show file tree

Hide file tree

Showing 11 changed files with 87 additions and 299 deletions.
diff --git a/plugins/actionable/controllers/admin/actionable.php b/plugins/actionable/controllers/admin/actionable.php
@@ -44,28 +44,19 @@ public function index($page = 1)
 
 			if (strtolower($status) == 'action')
 			{
-				//$actionable_filter = 'actionable = 1 AND action_taken = 0';
-				//$this->params['actionable'] = 'i.id IN (SELECT DISTINCT incident_id FROM `'.Kohana::config('database.default.table_prefix').'actionable` WHERE actionable = 1 AND action_taken = 0)';
-				$actionable_filter = 'actionable = 1';
-				$this->params['actionable'] = 'i.id IN (SELECT DISTINCT incident_id FROM `'.Kohana::config('database.default.table_prefix').'actionable` WHERE actionable = 1)';
+				$actionable_filter = 'actionable = 1 AND action_taken = 0';
+				$this->params['actionable'] = 'i.id IN (SELECT DISTINCT incident_id FROM `'.Kohana::config('database.default.table_prefix').'actionable` WHERE actionable = 1 AND action_taken = 0)';
 			}
 			elseif (strtolower($status) == 'urgent')
 			{
-				//$actionable_filter = 'action_urgent = 1 AND action_taken = 0';
-				//$this->params['actionable'] = 'i.id IN (SELECT DISTINCT incident_id FROM `'.Kohana::config('database.default.table_prefix').'actionable` WHERE action_urgent = 1 AND action_taken = 0)';
-				$actionable_filter = 'action_urgent = 1';
-				$this->params['actionable'] = 'i.id IN (SELECT DISTINCT incident_id FROM `'.Kohana::config('database.default.table_prefix').'actionable` WHERE action_urgent = 1)';
+				$actionable_filter = 'actionable = 2 AND action_taken = 0';
+				$this->params['actionable'] = 'i.id IN (SELECT DISTINCT incident_id FROM `'.Kohana::config('database.default.table_prefix').'actionable` WHERE actionable = 2 AND action_taken = 0)';
 			}
 			elseif (strtolower($status) == 'taken')
 			{
 				$actionable_filter = 'action_taken = 1';
 				$this->params['actionable'] = 'i.id IN (SELECT DISTINCT incident_id FROM `'.Kohana::config('database.default.table_prefix').'actionable` WHERE action_taken = 1)';
 			}
-			elseif (strtolower($status) == 'closed')
-			{
-				$actionable_filter = 'action_closed = 1';
-				$this->params['actionable'] = 'i.id IN (SELECT DISTINCT incident_id FROM `'.Kohana::config('database.default.table_prefix').'actionable` WHERE action_closed = 1)';
-			}
 			elseif (strtolower($status) == 'na')
 			{
 				$actionable_filter = 'actionable = 0 AND action_taken = 0';

diff --git a/plugins/actionable/css/actionable.css b/plugins/actionable/css/actionable.css