Merge pull request #354 from compucorp/PCHR-3369-tasks-and-workflows-…

…ux-improvements-cherry-picked PCHR-3369: Tasks and Workflows UX improvements
compucorp · Apr 30, 2018 · 56b875d · 56b875d
2 parents c6e387a + 9eb8de7
commit 56b875d
Show file tree

Hide file tree

Showing 52 changed files with 1,231 additions and 180 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -45,10 +45,13 @@
     "civicrm-cv": "^0.1.2",
     "gulp": "^3.9.1",
     "gulp-clean": "^0.4.0",
+    "gulp-concat": "^2.6.1",
     "gulp-rename": "^1.2.2",
     "gulp-replace": "^0.6.1",
     "gulp-sass": "^3.2.1",
     "gulp-sass-bulk-import": "^1.0.1",
+    "gulp-sourcemaps": "^2.6.4",
+    "gulp-uglify": "^3.0.0",
     "husky": "^0.14.3",
     "jasmine-core": "^2.9.1",
     "karma": "^2.0.2",

diff --git a/uk.co.compucorp.civicrm.tasksassignments/CRM/Tasksassignments/Page/Options.php b/uk.co.compucorp.civicrm.tasksassignments/CRM/Tasksassignments/Page/Options.php
@@ -3,11 +3,25 @@
 require_once 'CRM/Core/Page.php';
 
 class CRM_Tasksassignments_Page_Options extends CRM_Admin_Page_Options {
-  
+
   function run() {
     parent::run();
   }
-
+
+  /**
+   * Browse all options.
+   */
+  public function browse() {
+    parent::browse();
+
+    $optionValues = $this->get_template_vars('rows');
+    $optionValues = array_filter($optionValues, function ($item) {
+      return $item['is_reserved'] == 0;
+    });
+
+    $this->assign('rows', $optionValues);
+  }
+
   /**
    * Use the form name to create the tpl file name
    *
@@ -20,7 +34,7 @@ function getTemplateFileName() {
       'CRM_Admin_Page_Options'
     ) . '.tpl';
   }
-    
+
   function editForm() {
     //return self::$_gName ? 'CRM_Admin_Form_Options' : 'CRM_Admin_Form_OptionGroup';
     if (self::$_gName === 'activity_type') {