Commit 0930aeb6 by Jeffrey Phillips Committed by GitHub

Merge pull request #123 from jwforres/osbmetadata-references

Fix references to osbMetadata
parents d96c68e3 c6428709
...@@ -63,7 +63,7 @@ hawtioPluginLoader.addModule('openshiftCommonUI'); ...@@ -63,7 +63,7 @@ hawtioPluginLoader.addModule('openshiftCommonUI');
" <div ng-repeat=\"serviceInstance in ctrl.bindableServiceInstances\" class=\"bind-service-selection\">\n" + " <div ng-repeat=\"serviceInstance in ctrl.bindableServiceInstances\" class=\"bind-service-selection\">\n" +
" <label>\n" + " <label>\n" +
" <input type=\"radio\" ng-model=\"ctrl.serviceToBind\" ng-value=\"serviceInstance\">\n" + " <input type=\"radio\" ng-model=\"ctrl.serviceToBind\" ng-value=\"serviceInstance\">\n" +
" {{ctrl.serviceClasses[serviceInstance.spec.serviceClassName].osbMetadata.displayName || serviceInstance.spec.serviceClassName}}\n" + " {{ctrl.serviceClasses[serviceInstance.spec.serviceClassName].externalMetadata.displayName || serviceInstance.spec.serviceClassName}}\n" +
" </label>\n" + " </label>\n" +
" <div class=\"bind-description\">\n" + " <div class=\"bind-description\">\n" +
" <span class=\"pficon pficon-info\"\n" + " <span class=\"pficon pficon-info\"\n" +
...@@ -149,7 +149,7 @@ hawtioPluginLoader.addModule('openshiftCommonUI'); ...@@ -149,7 +149,7 @@ hawtioPluginLoader.addModule('openshiftCommonUI');
" <form>\n" + " <form>\n" +
" <div class=\"form-group\">\n" + " <div class=\"form-group\">\n" +
" <label>\n" + " <label>\n" +
" <h3>Create a binding for <strong>{{ctrl.serviceClass.osbMetadata.displayName || ctrl.serviceClassName}}</strong></h3>\n" + " <h3>Create a binding for <strong>{{ctrl.serviceClass.externalMetadata.displayName || ctrl.serviceClassName}}</strong></h3>\n" +
" </label>\n" + " </label>\n" +
" <span class=\"help-block\">Bindings create a secret containing the necessary information for an application to use this service.</span>\n" + " <span class=\"help-block\">Bindings create a secret containing the necessary information for an application to use this service.</span>\n" +
" </div>\n" + " </div>\n" +
......
...@@ -234,7 +234,7 @@ hawtioPluginLoader.addModule('openshiftCommonUI'); ...@@ -234,7 +234,7 @@ hawtioPluginLoader.addModule('openshiftCommonUI');
" <div ng-repeat=\"serviceInstance in ctrl.bindableServiceInstances\" class=\"bind-service-selection\">\n" + " <div ng-repeat=\"serviceInstance in ctrl.bindableServiceInstances\" class=\"bind-service-selection\">\n" +
" <label>\n" + " <label>\n" +
" <input type=\"radio\" ng-model=\"ctrl.serviceToBind\" ng-value=\"serviceInstance\">\n" + " <input type=\"radio\" ng-model=\"ctrl.serviceToBind\" ng-value=\"serviceInstance\">\n" +
" {{ctrl.serviceClasses[serviceInstance.spec.serviceClassName].osbMetadata.displayName || serviceInstance.spec.serviceClassName}}\n" + " {{ctrl.serviceClasses[serviceInstance.spec.serviceClassName].externalMetadata.displayName || serviceInstance.spec.serviceClassName}}\n" +
" </label>\n" + " </label>\n" +
" <div class=\"bind-description\">\n" + " <div class=\"bind-description\">\n" +
" <span class=\"pficon pficon-info\"\n" + " <span class=\"pficon pficon-info\"\n" +
...@@ -320,7 +320,7 @@ hawtioPluginLoader.addModule('openshiftCommonUI'); ...@@ -320,7 +320,7 @@ hawtioPluginLoader.addModule('openshiftCommonUI');
" <form>\n" + " <form>\n" +
" <div class=\"form-group\">\n" + " <div class=\"form-group\">\n" +
" <label>\n" + " <label>\n" +
" <h3>Create a binding for <strong>{{ctrl.serviceClass.osbMetadata.displayName || ctrl.serviceClassName}}</strong></h3>\n" + " <h3>Create a binding for <strong>{{ctrl.serviceClass.externalMetadata.displayName || ctrl.serviceClassName}}</strong></h3>\n" +
" </label>\n" + " </label>\n" +
" <span class=\"help-block\">Bindings create a secret containing the necessary information for an application to use this service.</span>\n" + " <span class=\"help-block\">Bindings create a secret containing the necessary information for an application to use this service.</span>\n" +
" </div>\n" + " </div>\n" +
......
...@@ -34,7 +34,7 @@ angular.module('openshiftCommonUI').run(['$templateCache', function($templateCac ...@@ -34,7 +34,7 @@ angular.module('openshiftCommonUI').run(['$templateCache', function($templateCac
" <div ng-repeat=\"serviceInstance in ctrl.bindableServiceInstances\" class=\"bind-service-selection\">\n" + " <div ng-repeat=\"serviceInstance in ctrl.bindableServiceInstances\" class=\"bind-service-selection\">\n" +
" <label>\n" + " <label>\n" +
" <input type=\"radio\" ng-model=\"ctrl.serviceToBind\" ng-value=\"serviceInstance\">\n" + " <input type=\"radio\" ng-model=\"ctrl.serviceToBind\" ng-value=\"serviceInstance\">\n" +
" {{ctrl.serviceClasses[serviceInstance.spec.serviceClassName].osbMetadata.displayName || serviceInstance.spec.serviceClassName}}\n" + " {{ctrl.serviceClasses[serviceInstance.spec.serviceClassName].externalMetadata.displayName || serviceInstance.spec.serviceClassName}}\n" +
" </label>\n" + " </label>\n" +
" <div class=\"bind-description\">\n" + " <div class=\"bind-description\">\n" +
" <span class=\"pficon pficon-info\"\n" + " <span class=\"pficon pficon-info\"\n" +
...@@ -120,7 +120,7 @@ angular.module('openshiftCommonUI').run(['$templateCache', function($templateCac ...@@ -120,7 +120,7 @@ angular.module('openshiftCommonUI').run(['$templateCache', function($templateCac
" <form>\n" + " <form>\n" +
" <div class=\"form-group\">\n" + " <div class=\"form-group\">\n" +
" <label>\n" + " <label>\n" +
" <h3>Create a binding for <strong>{{ctrl.serviceClass.osbMetadata.displayName || ctrl.serviceClassName}}</strong></h3>\n" + " <h3>Create a binding for <strong>{{ctrl.serviceClass.externalMetadata.displayName || ctrl.serviceClassName}}</strong></h3>\n" +
" </label>\n" + " </label>\n" +
" <span class=\"help-block\">Bindings create a secret containing the necessary information for an application to use this service.</span>\n" + " <span class=\"help-block\">Bindings create a secret containing the necessary information for an application to use this service.</span>\n" +
" </div>\n" + " </div>\n" +
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<div ng-repeat="serviceInstance in ctrl.bindableServiceInstances" class="bind-service-selection"> <div ng-repeat="serviceInstance in ctrl.bindableServiceInstances" class="bind-service-selection">
<label> <label>
<input type="radio" ng-model="ctrl.serviceToBind" ng-value="serviceInstance"> <input type="radio" ng-model="ctrl.serviceToBind" ng-value="serviceInstance">
{{ctrl.serviceClasses[serviceInstance.spec.serviceClassName].osbMetadata.displayName || serviceInstance.spec.serviceClassName}} {{ctrl.serviceClasses[serviceInstance.spec.serviceClassName].externalMetadata.displayName || serviceInstance.spec.serviceClassName}}
</label> </label>
<div class="bind-description"> <div class="bind-description">
<span class="pficon pficon-info" <span class="pficon pficon-info"
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<form> <form>
<div class="form-group"> <div class="form-group">
<label> <label>
<h3>Create a binding for <strong>{{ctrl.serviceClass.osbMetadata.displayName || ctrl.serviceClassName}}</strong></h3> <h3>Create a binding for <strong>{{ctrl.serviceClass.externalMetadata.displayName || ctrl.serviceClassName}}</strong></h3>
</label> </label>
<span class="help-block">Bindings create a secret containing the necessary information for an application to use this service.</span> <span class="help-block">Bindings create a secret containing the necessary information for an application to use this service.</span>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment