Allow form select to show specific text for empty option that is not placeholder option… (#13763)

* Allow form select to show specific text for empty option that is not placeholder option & add missing translation.

* Add some code for new section

* Add explicit ability to set access for all websites to user permission edit component.

* Update expected screenshots.

1 files changed, 13 insertions, 1 deletions

diff --git a/plugins/CorePluginsAdmin/angularjs/form-field/form-field.directive.js b/plugins/CorePluginsAdmin/angularjs/form-field/form-field.directive.js
index 5637c88902..3b92dcbc56 100644
--- a/plugins/CorePluginsAdmin/angularjs/form-field/form-field.directive.js
+++ b/plugins/CorePluginsAdmin/angularjs/form-field/form-field.directive.js
@@ -367,7 +367,10 @@
                     field.availableOptions = formatAvailableValues(field);
 
                     // for selects w/ a placeholder, add an option to unset the select
-                    if (field.uiControl === 'select' && field.uiControlAttributes.placeholder) {
+                    if (field.uiControl === 'select'
+                        && field.uiControlAttributes.placeholder
+                        && !hasOption('')
+                    ) {
                         field.availableOptions.splice(0, 0, { key: '', value: '' });
                     }
 
@@ -432,6 +435,15 @@
                     scope.templateLoaded = function () {
                         $timeout(whenRendered(scope, element, inlineHelpNode));
                     };
+
+                    function hasOption(key) {
+                        for (var i = 0; i !== field.availableOptions.length; ++i) {
+                            if (field.availableOptions[i].key === key) {
+                                return true;
+                            }
+                        }
+                        return false;
+                    }
                 };
             }
         };