Merge pull request #1330 from jloguercio/1.11.x

Fix Skill Wheel that showing disabled skills - Refs #8370

main/inc/ajax/skill.ajax.php

@@ -140,7 +140,7 @@ switch ($action) {
         $userId = isset($_REQUEST['load_user']) && $_REQUEST['load_user'] == 1 ? api_get_user_id() : 0;
         $skill_id = isset($_REQUEST['skill_id']) ? intval($_REQUEST['skill_id']) : 0;
         $depth = isset($_REQUEST['main_depth']) ? intval($_REQUEST['main_depth']) : 2;
-        $all = $skill->get_skills_tree_json($userId, $skill_id, false, $depth);
+        $all = $skill->get_skills_tree_json($userId, $skill_id, false, $depth, true);
         echo $all;
         break;
     case 'get_user_skill':

main/inc/lib/skill.lib.php

@@ -1089,18 +1089,28 @@ class Skill extends Model
      * @param int skill id
      * @param bool return a flat array or not
      * @param int depth of the skills
-     *
+     * @param bool filter status
+     * @return json
      */
-    public function get_skills_tree_json($user_id = null, $skill_id = null, $return_flat_array = false, $main_depth = 2)
+    public function get_skills_tree_json($user_id = null, $skill_id = null, $return_flat_array = false, $main_depth = 2, $filter_status = false)
     {
         $tree = $this->get_skills_tree($user_id, $skill_id, $return_flat_array, true);
         $simple_tree = array();
         if (!empty($tree['children'])) {
             foreach ($tree['children'] as $element) {
-                $simple_tree[] = array(
-                    'name' => $element['name'],
-                    'children' => $this->get_skill_json($element['children'], 1, $main_depth)
-                );
+                if ($filter_status) {
+                    if (intval($element['status'])) {
+                        $simple_tree[] = array(
+                            'name' => $element['name'],
+                            'children' => $this->get_skill_json($element['children'], 1, $main_depth, $filter_status)
+                        );
+                    }
+                } else {
+                    $simple_tree[] = array(
+                        'name' => $element['name'],
+                        'children' => $this->get_skill_json($element['children'], 1, $main_depth)
+                    );
+                }
             }
         }
 
@@ -1112,21 +1122,28 @@ class Skill extends Model
      * @param array $subtree
      * @param int $depth
      * @param int $max_depth
+     * @param bool $filter_status
      * @return array|null
      */
-    public function get_skill_json($subtree, $depth = 1, $max_depth = 2)
+    public function get_skill_json($subtree, $depth = 1, $max_depth = 2, $filter_status = false)
     {
         $simple_sub_tree = array();
         if (is_array($subtree)) {
             $counter = 1;
             foreach ($subtree as $elem) {
+                if ($filter_status) {
+                    if (!intval($elem['status'])) {
+                        break 1;
+                    }
+                }
+
                 $tmp = array();
                 $tmp['name'] = $elem['name'];
                 $tmp['id'] = $elem['id'];
                 $tmp['isSearched'] = self::isSearched($elem['id']);
 
                 if (isset($elem['children']) && is_array($elem['children'])) {
-                    $tmp['children'] = $this->get_skill_json($elem['children'], $depth + 1, $max_depth);
+                    $tmp['children'] = $this->get_skill_json($elem['children'], $depth + 1, $max_depth, $filter_status);
                 } else {
                     //$tmp['colour'] = $this->colours[$depth][rand(0,3)];
                 }