Merge pull request #1744 from spadgett/bind-requester-username

Merged by openshift-bot

Author: OpenShift Bot

app/scripts/directives/bindService.js

@@ -38,7 +38,7 @@
           newestNotReady = instance;
         }
       });
-      ctrl.serviceToBind = _.get(newestReady, 'metadata.name') || _.get(newestNotReady, 'metadata.name');
+      ctrl.serviceToBind = newestReady || newestNotReady;
     };
 
     var sortServiceInstances = function() {
@@ -201,14 +201,15 @@
     };
 
     ctrl.bindService = function() {
-      var svcToBind = ctrl.target.kind === 'Instance' ? ctrl.target : ctrl.serviceInstances[ctrl.serviceToBind];
+      var svcToBind = ctrl.target.kind === 'Instance' ? ctrl.target : ctrl.serviceToBind;
       var application = ctrl.bindType === 'application' ? ctrl.appToBind : undefined;
 
       var context = {
         namespace: _.get(svcToBind, 'metadata.namespace')
       };
 
-      BindingService.bindService(context, _.get(svcToBind, 'metadata.name'), application).then(function(binding){
+      var serviceClass = BindingService.getServiceClassForInstance(svcToBind, ctrl.serviceClasses);
+      BindingService.bindService(svcToBind, application, serviceClass).then(function(binding){
         ctrl.binding = binding;
         ctrl.error = null;
 

bower.json

@@ -46,8 +46,8 @@
     "angular-moment": "1.0.0",
     "angular-utf8-base64": "0.0.5",
     "file-saver": "1.3.3",
-    "origin-web-common": "0.0.36",
-    "origin-web-catalog": "0.0.23"
+    "origin-web-common": "0.0.37",
+    "origin-web-catalog": "0.0.24"
   },
   "devDependencies": {
     "angular-mocks": "1.5.11",

dist/scripts/scripts.js

@@ -12245,7 +12245,7 @@ var a, b;
 _.each(l.serviceInstances, function(c) {
 var d = "True" === _.get(m(c, "Ready"), "status");
 d && (!a || c.metadata.creationTimestamp > a.metadata.creationTimestamp) && (a = c), d || b && !(c.metadata.creationTimestamp > b.metadata.creationTimestamp) || (b = c);
-}), l.serviceToBind = _.get(a, "metadata.name") || _.get(b, "metadata.name");
+}), l.serviceToBind = a || b;
 }, o = function() {
 l.serviceClasses && l.serviceInstances && (l.orderedServiceInstances = _.sortByAll(l.serviceInstances, function(a) {
 return _.get(l.serviceClasses, [ a.spec.serviceClassName, "osbMetadata", "displayName" ]) || a.spec.serviceClassName;
@@ -12322,10 +12322,10 @@ l.serviceClasses = a.by("metadata.name"), "Instance" === l.target.kind && (l.ser
 }, l.$onDestroy = function() {
 e && (e(), e = void 0), f && c.unwatch(f);
 }, l.bindService = function() {
-var a = "Instance" === l.target.kind ? l.target :l.serviceInstances[l.serviceToBind], b = "application" === l.bindType ? l.appToBind :void 0, e = {
+var a = "Instance" === l.target.kind ? l.target :l.serviceToBind, b = "application" === l.bindType ? l.appToBind :void 0, e = {
 namespace:_.get(a, "metadata.namespace")
-};
-d.bindService(e, _.get(a, "metadata.name"), b).then(function(a) {
+}, g = d.getServiceClassForInstance(a, l.serviceClasses);
+d.bindService(a, b, g).then(function(a) {
 l.binding = a, l.error = null, f = c.watchObject(d.bindingResource, _.get(l.binding, "metadata.name"), e, function(a) {
 l.binding = a;
 });