Add logo field back to addOrEditSpec (#209)

* Update addOrEditSpec.html * Update AddOrEditSpecController.js
nds-org · Jul 27, 2017 · 5a891bf · 5a891bf
1 parent a47c0c6
commit 5a891bf
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/gui/app/catalog/addOrEdit/AddOrEditSpecController.js b/gui/app/catalog/addOrEdit/AddOrEditSpecController.js
@@ -209,6 +209,11 @@ angular
       spec.readinessProbe = angular.copy($scope.probe);
     }
 
+    // Replace a value of "" in logo with "/asset/png/logos/ndslabs-badge.png"
+    if (!$scope.spec.logo) {
+      $scope.spec.logo = "/asset/png/logos/ndslabs-badge.png"; 
+    }
+
     // Replace a value of "" in contextPath with "/"
     angular.forEach($scope.spec.ports, function(port) {
       if (!port.contextPath || port.contextPath.replace(/ /g,'') === '') {

diff --git a/gui/app/catalog/addOrEdit/addOrEditSpec.html b/gui/app/catalog/addOrEdit/addOrEditSpec.html
@@ -48,16 +48,15 @@ <h3>{{ editingSpec ? 'Edit' : 'Add' }} Application<span ng-if="spec.label">: {{
                                             </div>
 
                                             <!-- Logo URL (optional) -->
-                                            <!-- Commented out, due to logos now beinbg locally-sourced -->
-                                            <!-- All user specs in the catalog will use the default NDS badge -->
-                                            <!-- <div class="form-group">
+                                            <!-- All user specs in the catalog will default to using the NDS badge -->
+                                            <div class="form-group">
                                                 <label for="logoField">Logo <sup><i class="fa fa-fw fa-question-circle" tooltip-placement="left" uib-tooltip="A URL to a small logo for this service"></i></sup></label>
                                                 <input type="url" class="form-control" id="logoField" name="logoField" placeholder="Enter Logo URL..." ng-model="spec.logo">
 
                                                 <ng-messages class="text-danger" for="modifySpec.logoField.$error" role="alert">
                                                   <ng-message when="url">Please enter a valid URL</ng-message>
                                                 </ng-messages>
-                                            </div> -->
+                                            </div>
 
                                             <!-- Info URL (optional) -->
                                             <div class="form-group">