Merge pull request #84 from jeff-phillips-18/bind

Disable application selection in bind form when no applications.

dist/origin-web-common-ui.js

@@ -136,19 +136,19 @@ hawtioPluginLoader.addModule('openshiftCommonUI');
     "  <form name=\"ctrl.formName\" class=\"mar-bottom-lg\">\n" +
     "    <fieldset>\n" +
     "      <div class=\"radio\">\n" +
-    "        <label class=\"bind-choice\">\n" +
-    "          <input type=\"radio\" ng-model=\"ctrl.shouldBindToApp\" value=\"true\">\n" +
+    "        <label class=\"bind-choice\" ng-disabled=\"!$ctrl.applications.length\">\n" +
+    "          <input type=\"radio\" ng-model=\"ctrl.shouldBindToApp\" value=\"true\" ng-disabled=\"!$ctrl.applications.length\">\n" +
     "          Bind to an application\n" +
     "        </label>\n" +
     "        <div class=\"application-select\">\n" +
     "          <ui-select ng-model=\"ctrl.appToBind\"\n" +
     "                     ng-disabled=\"ctrl.shouldBindToApp !== 'true'\"\n" +
     "                     ng-required=\"ctrl.shouldBindToApp === 'true'\">\n" +
-    "            <ui-select-match placeholder=\"Select an application\">\n" +
-    "            <span>\n" +
-    "              {{$select.selected.metadata.name}}\n" +
-    "              <small class=\"text-muted\">&ndash; {{$select.selected.kind | humanizeKind : true}}</small>\n" +
-    "            </span>\n" +
+    "            <ui-select-match placeholder=\"{{$ctrl.applications.length ? 'Select an application' : 'There are no applications in this project'}}\">\n" +
+    "              <span>\n" +
+    "                {{$select.selected.metadata.name}}\n" +
+    "                <small class=\"text-muted\">&ndash; {{$select.selected.kind | humanizeKind : true}}</small>\n" +
+    "              </span>\n" +
     "            </ui-select-match>\n" +
     "            <ui-select-choices\n" +
     "              repeat=\"application in (ctrl.applications) | filter : { metadata: { name: $select.search } } track by (application | uid)\"\n" +

dist/origin-web-common.js

@@ -307,19 +307,19 @@ hawtioPluginLoader.addModule('openshiftCommonUI');
     "  <form name=\"ctrl.formName\" class=\"mar-bottom-lg\">\n" +
     "    <fieldset>\n" +
     "      <div class=\"radio\">\n" +
-    "        <label class=\"bind-choice\">\n" +
-    "          <input type=\"radio\" ng-model=\"ctrl.shouldBindToApp\" value=\"true\">\n" +
+    "        <label class=\"bind-choice\" ng-disabled=\"!$ctrl.applications.length\">\n" +
+    "          <input type=\"radio\" ng-model=\"ctrl.shouldBindToApp\" value=\"true\" ng-disabled=\"!$ctrl.applications.length\">\n" +
     "          Bind to an application\n" +
     "        </label>\n" +
     "        <div class=\"application-select\">\n" +
     "          <ui-select ng-model=\"ctrl.appToBind\"\n" +
     "                     ng-disabled=\"ctrl.shouldBindToApp !== 'true'\"\n" +
     "                     ng-required=\"ctrl.shouldBindToApp === 'true'\">\n" +
-    "            <ui-select-match placeholder=\"Select an application\">\n" +
-    "            <span>\n" +
-    "              {{$select.selected.metadata.name}}\n" +
-    "              <small class=\"text-muted\">&ndash; {{$select.selected.kind | humanizeKind : true}}</small>\n" +
-    "            </span>\n" +
+    "            <ui-select-match placeholder=\"{{$ctrl.applications.length ? 'Select an application' : 'There are no applications in this project'}}\">\n" +
+    "              <span>\n" +
+    "                {{$select.selected.metadata.name}}\n" +
+    "                <small class=\"text-muted\">&ndash; {{$select.selected.kind | humanizeKind : true}}</small>\n" +
+    "              </span>\n" +
     "            </ui-select-match>\n" +
     "            <ui-select-choices\n" +
     "              repeat=\"application in (ctrl.applications) | filter : { metadata: { name: $select.search } } track by (application | uid)\"\n" +

dist/scripts/templates.js

@@ -118,19 +118,19 @@ angular.module('openshiftCommonUI').run(['$templateCache', function($templateCac
     "  <form name=\"ctrl.formName\" class=\"mar-bottom-lg\">\n" +
     "    <fieldset>\n" +
     "      <div class=\"radio\">\n" +
-    "        <label class=\"bind-choice\">\n" +
-    "          <input type=\"radio\" ng-model=\"ctrl.shouldBindToApp\" value=\"true\">\n" +
+    "        <label class=\"bind-choice\" ng-disabled=\"!$ctrl.applications.length\">\n" +
+    "          <input type=\"radio\" ng-model=\"ctrl.shouldBindToApp\" value=\"true\" ng-disabled=\"!$ctrl.applications.length\">\n" +
     "          Bind to an application\n" +
     "        </label>\n" +
     "        <div class=\"application-select\">\n" +
     "          <ui-select ng-model=\"ctrl.appToBind\"\n" +
     "                     ng-disabled=\"ctrl.shouldBindToApp !== 'true'\"\n" +
     "                     ng-required=\"ctrl.shouldBindToApp === 'true'\">\n" +
-    "            <ui-select-match placeholder=\"Select an application\">\n" +
-    "            <span>\n" +
-    "              {{$select.selected.metadata.name}}\n" +
-    "              <small class=\"text-muted\">&ndash; {{$select.selected.kind | humanizeKind : true}}</small>\n" +
-    "            </span>\n" +
+    "            <ui-select-match placeholder=\"{{$ctrl.applications.length ? 'Select an application' : 'There are no applications in this project'}}\">\n" +
+    "              <span>\n" +
+    "                {{$select.selected.metadata.name}}\n" +
+    "                <small class=\"text-muted\">&ndash; {{$select.selected.kind | humanizeKind : true}}</small>\n" +
+    "              </span>\n" +
     "            </ui-select-match>\n" +
     "            <ui-select-choices\n" +
     "              repeat=\"application in (ctrl.applications) | filter : { metadata: { name: $select.search } } track by (application | uid)\"\n" +

src/components/binding/bindServiceForm.html

@@ -11,19 +11,19 @@
   <form name="ctrl.formName" class="mar-bottom-lg">
     <fieldset>
       <div class="radio">
-        <label class="bind-choice">
-          <input type="radio" ng-model="ctrl.shouldBindToApp" value="true">
+        <label class="bind-choice" ng-disabled="!$ctrl.applications.length">
+          <input type="radio" ng-model="ctrl.shouldBindToApp" value="true" ng-disabled="!$ctrl.applications.length">
           Bind to an application
         </label>
         <div class="application-select">
           <ui-select ng-model="ctrl.appToBind"
                      ng-disabled="ctrl.shouldBindToApp !== 'true'"
                      ng-required="ctrl.shouldBindToApp === 'true'">
-            <ui-select-match placeholder="Select an application">
-            <span>
-              {{$select.selected.metadata.name}}
-              <small class="text-muted">&ndash; {{$select.selected.kind | humanizeKind : true}}</small>
-            </span>
+            <ui-select-match placeholder="{{$ctrl.applications.length ? 'Select an application' : 'There are no applications in this project'}}">
+              <span>
+                {{$select.selected.metadata.name}}
+                <small class="text-muted">&ndash; {{$select.selected.kind | humanizeKind : true}}</small>
+              </span>
             </ui-select-match>
             <ui-select-choices
               repeat="application in (ctrl.applications) | filter : { metadata: { name: $select.search } } track by (application | uid)"