Merge pull request #40 from spadgett/fix-template-descriptions

Bug 1444200 - Fix problem showing template descriptions

dist/origin-web-common-ui.js

@@ -868,8 +868,10 @@ angular.module('openshiftCommonUI')
   .filter('description', function(annotationFilter) {
     return function(resource) {
       // Prefer `openshift.io/description`, but fall back to `kubernetes.io/description`.
+      // Templates use simply `description` without a namespace.
       return annotationFilter(resource, 'openshift.io/description') ||
-             annotationFilter(resource, 'kubernetes.io/description');
+             annotationFilter(resource, 'kubernetes.io/description') ||
+             annotationFilter(resource, 'description');
     };
   })
   .filter('displayName', function(annotationFilter) {

dist/origin-web-common.js

@@ -1075,8 +1075,10 @@ angular.module('openshiftCommonUI')
   .filter('description', ["annotationFilter", function(annotationFilter) {
     return function(resource) {
       // Prefer `openshift.io/description`, but fall back to `kubernetes.io/description`.
+      // Templates use simply `description` without a namespace.
       return annotationFilter(resource, 'openshift.io/description') ||
-             annotationFilter(resource, 'kubernetes.io/description');
+             annotationFilter(resource, 'kubernetes.io/description') ||
+             annotationFilter(resource, 'description');
     };
   }])
   .filter('displayName', ["annotationFilter", function(annotationFilter) {

src/filters/resources.js

@@ -26,8 +26,10 @@ angular.module('openshiftCommonUI')
   .filter('description', function(annotationFilter) {
     return function(resource) {
       // Prefer `openshift.io/description`, but fall back to `kubernetes.io/description`.
+      // Templates use simply `description` without a namespace.
       return annotationFilter(resource, 'openshift.io/description') ||
-             annotationFilter(resource, 'kubernetes.io/description');
+             annotationFilter(resource, 'kubernetes.io/description') ||
+             annotationFilter(resource, 'description');
     };
   })
   .filter('displayName', function(annotationFilter) {