Xlate role_type search param to descriptive title

ansible · Oct 3, 2016 · a58c766 · a58c766
1 parent ec66e02
commit a58c766
Showing 1 changed file with 18 additions and 7 deletions.
diff --git a/galaxy/static/js/listApp/roleListController.js b/galaxy/static/js/listApp/roleListController.js
@@ -258,13 +258,13 @@
                 .$promise.then(function(data) {
                     angular.forEach(data.results, function(row) {
                         if (row.role_type == 'ANS') {
-                            row.display_type = 'AN';
+                            row.display_type = 'ANS';
                             row.display_type_title = 'Ansible';
                         } else if (row.role_type == 'CON') {
-                            row.display_type = 'CR';
+                            row.display_type = 'CON';
                             row.display_type_title = 'Container Enabled';
                         } else if (row.role_type == 'APP') {
-                            row.display_type = 'CA';
+                            row.display_type = 'APP';
                             row.display_type_title = 'Container App';
                         }
                     });
@@ -485,10 +485,21 @@
 
         function _getKeys(type, data, results) {
             data.split(' ').forEach(function(key) {
-                results.push({
-                    type: type,
-                    value: key
-                });
+                if (type == 'Role Type') {
+                    angular.forEach($scope.searchRoleTypes, function(rt) {
+                        if (rt.value == key) {
+                            results.push({
+                                type: type,
+                                value: rt.title
+                            });
+                        }
+                    });
+                } else {
+                    results.push({
+                        type: type,
+                        value: key
+                    });
+                }
             });
         }