Bug 1575488 - Don't show duplicate key error when key is blank

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1575488
openshift · May 7, 2018 · 6f87018 · 6f87018
1 parent 173ad50
commit 6f87018
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/views/directives/edit-config-map-or-secret.html b/app/views/directives/edit-config-map-or-secret.html
@@ -79,7 +79,7 @@
             Key is required.
           </span>
         </div>
-        <div class="has-error" ng-show="keyValueMapForm['key-' + $id].$error.oscUnique && keyValueMapForm['key-' + $id].$touched">
+        <div class="has-error" ng-show="keyValueMapForm['key-' + $id].$error.oscUnique && keyValueMapForm['key-' + $id].$touched && item.key">
           <span class="help-block">
             Duplicate key "{{item.key}}". Keys must be unique within the {{type}}.
           </span>

diff --git a/dist/scripts/templates.js b/dist/scripts/templates.js
@@ -6722,7 +6722,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "Key is required.\n" +
     "</span>\n" +
     "</div>\n" +
-    "<div class=\"has-error\" ng-show=\"keyValueMapForm['key-' + $id].$error.oscUnique && keyValueMapForm['key-' + $id].$touched\">\n" +
+    "<div class=\"has-error\" ng-show=\"keyValueMapForm['key-' + $id].$error.oscUnique && keyValueMapForm['key-' + $id].$touched && item.key\">\n" +
     "<span class=\"help-block\">\n" +
     "Duplicate key \"{{item.key}}\". Keys must be unique within the {{type}}.\n" +
     "</span>\n" +