This is an automated email from the git hooks/post-receive script.
mreynolds pushed a commit to branch master in repository 389-ds-base.
The following commit(s) were added to refs/heads/master by this push: new db876c6 Issue 50546 - fix more UI issues(part 2) db876c6 is described below
commit db876c62309810e9c5ac14a553e5c1135af55bd7 Author: Mark Reynolds mreynolds@redhat.com AuthorDate: Tue Sep 10 15:13:38 2019 -0400
Issue 50546 - fix more UI issues(part 2)
Description: Fixed minor issues not fully addressed from the last commit
relates: https://pagure.io/389-ds-base/issue/50546
Reviewed by: mreynolds (one line commit rule) --- src/cockpit/389-console/src/ds.js | 22 +--------------- src/cockpit/389-console/src/index.html | 9 ++++--- src/cockpit/389-console/src/schema.html | 6 ++--- src/cockpit/389-console/src/servers.html | 17 +++--------- src/cockpit/389-console/src/servers.js | 45 +++----------------------------- 5 files changed, 16 insertions(+), 83 deletions(-)
diff --git a/src/cockpit/389-console/src/ds.js b/src/cockpit/389-console/src/ds.js index efe337c..702ff88 100644 --- a/src/cockpit/389-console/src/ds.js +++ b/src/cockpit/389-console/src/ds.js @@ -346,27 +346,7 @@ function popup_success(msg) { // This is called when any Save button is clicked on the main page. We call // all the save functions for all the pages here. This is not used for modal forms function save_all () { - if ("nsslapd-ldapilisten" in config_values || "nsslapd-ldapiautobind" in config_values) { - if ( (!$("#nsslapd-ldapilisten").is(":checked") && config_values["nsslapd-ldapilisten"] == "on") || - (!$("#nsslapd-ldapiautobind").is(":checked") && config_values["nsslapd-ldapiautobind"] == "on") ) - { - // Okay we are disabling some form of LDAPI that will break the UI, warn the user - popup_confirm("Disabling LDAPI or LDAPI Autobind will make the UI unusable. Are you sure you want to proceed", - "Confirmation", function (yes) - { - if (yes) { - save_config(); - } else { - // No, reset config - get_and_set_config(); - } - }); - } else { - save_config(); - } - } else { - save_config(); - } + save_config(); // Server Config Page }
function load_repl_suffix_dropdowns() { diff --git a/src/cockpit/389-console/src/index.html b/src/cockpit/389-console/src/index.html index 1a42c97..91993cc 100644 --- a/src/cockpit/389-console/src/index.html +++ b/src/cockpit/389-console/src/index.html @@ -411,13 +411,14 @@ </div> <hr> <div> - <label for="backend-name" class="ds-config-label" title="The name for the backend database, like 'userroot'">Backend Name (optional)</label><input - class="ds-input ds-inst-input" placeholder="e.g. userRoot" size="40" type="text" id="backend-name"> + <label for="backend-suffix" class="ds-config-label" title="Database suffix, like 'dc=example,dc=com'. The suffix must be a valid LDAP Distiguished Name (DN)">Database Suffix</label><input + class="ds-input ds-inst-input" size="40" placeholder="e.g. dc=example,dc=com" type="text" id="backend-suffix"> </div> <div> - <label for="backend-suffix" class="ds-config-label" title="Database suffix, like 'dc=example,dc=com'">Backend Suffix (optional)</label><input - class="ds-input ds-inst-input" size="40" placeholder="e.g. dc=example,dc=com" type="text" id="backend-suffix"> + <label for="backend-name" class="ds-config-label" title="The name for the backend database, like 'userroot'. The name can be a combination of alphanumeric characters, dashes (-), and underscores (_). No other characters are allowed.">Database Name</label><input + class="ds-input ds-inst-input" placeholder="e.g. userRoot" size="40" type="text" id="backend-name"> </div> + <div> <label for="create-sample-entries" class="ds-config-label" title="Create sample entries in the suffix">Create Sample Entries </label><input type="checkbox" class="ds-input ds-config-checkbox" id="create-sample-entries"> diff --git a/src/cockpit/389-console/src/schema.html b/src/cockpit/389-console/src/schema.html index 872abab..36f61be 100644 --- a/src/cockpit/389-console/src/schema.html +++ b/src/cockpit/389-console/src/schema.html @@ -102,11 +102,11 @@ class="ds-input" type="text" id="attr-usage-view" size="40" readonly /> </div> <div> - <input type="checkbox" class="ds-config-checkbox" id="attr-multivalued-view" readonly /><label + <input type="checkbox" class="ds-config-checkbox" id="attr-multivalued-view" disabled="disabled" /><label for="attr-multivalued-view" class="ds-label"> Attribute Multi-Valued </label> </div> <div> - <input type="checkbox" class="ds-config-checkbox" id="attr-no-user-mod-view" readonly /><label + <input type="checkbox" class="ds-config-checkbox" id="attr-no-user-mod-view" disabled="disabled" /><label for="attr-no-user-mod-view" class="ds-label"> Read-only (NO-USER-MODIFICATION flag) </label> </div> <div> @@ -330,7 +330,7 @@ <hr> <div class="ds-container"> <div name="available-attrs"> - <label class="ds-config-label" for="schema-list" title="The available attributes to choose from."><b>Available Attributes</b></label> + <label for="schema-list" title="The available attributes to choose from."><b>Available Attributes</b></label> <select id="schema-list" class="ds-oc-form-list" name="availattrs" multiple> </select> </div> diff --git a/src/cockpit/389-console/src/servers.html b/src/cockpit/389-console/src/servers.html index 02e39ab..04678e8 100644 --- a/src/cockpit/389-console/src/servers.html +++ b/src/cockpit/389-console/src/servers.html @@ -948,24 +948,15 @@ --> <div id="server-ldapi" class="all-pages ds-margin-left" hidden> <h3 class="ds-config-header">LDAPI & Autobind Settings</h3> - <div> - <input type="checkbox" class="ds-config-checkbox" id="nsslapd-ldapilisten" checked><label - for="nsslapd-ldapilisten" class="ds-label" title="Enable LDAPI (nsslapd-ldapilisten)."> Enable LDAPI</label> - </div> <div class="ldapi-attrs ds-inline" hidden> <div> - <label for="nsslapd-ldapifilepath" class="ds-config-indent-sm-label" title="The Unix socket file (nsslapd-ldapifilepath).">LDAPI Socket File Path</label><input - class="ds-input" type="text" id="nsslapd-ldapifilepath" size="35"/> - </div> - <div> - <p></p> - <input type="checkbox" class="ds-config-checkbox" id="nsslapd-ldapiautobind"><label - for="nsslapd-ldapiautobind" class="ds-label" title="Enable autobind (nsslapd-ldapiautobind)."> Enable Autobind</label> + <label for="nsslapd-ldapifilepath" class="ds-config-label" title="The Unix socket file (nsslapd-ldapifilepath).">LDAPI Socket File Path</label><input + class="ds-input" type="text" id="nsslapd-ldapifilepath" size="35" readonly/> </div> <div class="ds-inline"> - <div class="autobind-attrs" hidden> + <div class="autobind-attrs"> <div> - <label for="nsslapd-ldapimaprootdn" class="ds-config-indent-sm-label" title="Map the Unix root entry to this Directory Manager DN (nsslapd-ldapimaprootdn).">DN to map "root" To</label><input + <label for="nsslapd-ldapimaprootdn" class="ds-config-label" title="Map the Unix root entry to this Directory Manager DN (nsslapd-ldapimaprootdn).">DN to map "root" To</label><input class="ds-input" type="text" id="nsslapd-ldapimaprootdn" placeholder="e.g. cn=Directory Manager" size="35"/> </div> <div> diff --git a/src/cockpit/389-console/src/servers.js b/src/cockpit/389-console/src/servers.js index 3d1c4fa..b2a4b0f 100644 --- a/src/cockpit/389-console/src/servers.js +++ b/src/cockpit/389-console/src/servers.js @@ -115,8 +115,8 @@ function clear_inst_form() { $("#create-inst-rootdn").val("cn=Directory Manager"); $("#rootdn-pw").val(""); $("#rootdn-pw-confirm").val(""); - $("#backend-suffix").val(""); - $("#backend-name").val(""); + $("#backend-suffix").val("dc=example,dc=com"); + $("#backend-name").val("userRoot"); $("#create-sample-entries").prop('checked', false); $("#create-inst-tls").prop('checked', true); $(".ds-inst-input").css("border-color", "initial"); @@ -963,45 +963,6 @@ $(document).ready( function() { });
// LDAPI form control - $("#nsslapd-ldapilisten").change(function() { - if(this.checked) { - $('.ldapi-attrs').show(); - if ( $("#nsslapd-ldapiautobind").is(":checked") ){ - $(".autobind-attrs").show(); - if ( $("#nsslapd-ldapimaptoentries").is(":checked") ){ - $(".autobind-entry-attrs").show(); - } else { - $(".autobind-entry-attrs").hide(); - } - } else { - $(".autobind-attrs").hide(); - $(".autobind-entry-attrs").hide(); - $("#nsslapd-ldapimaptoentries").prop("checked", false ); - } - } else { - $('.ldapi-attrs').hide(); - $(".autobind-attrs").hide(); - $(".autobind-entry-attrs").hide(); - $("#nsslapd-ldapiautobind").prop("checked", false ); - $("#nsslapd-ldapimaptoentries").prop("checked", false ); - } - }); - - $("#nsslapd-ldapiautobind").change(function() { - if (this.checked){ - $(".autobind-attrs").show(); - if ( $("#nsslapd-ldapimaptoentries").is(":checked") ){ - $(".autobind-entry-attrs").show(); - } else { - $(".autobind-entry-attrs").hide(); - } - } else { - $(".autobind-attrs").hide(); - $(".autobind-entry-attrs").hide(); - $("#nsslapd-ldapimaptoentries").prop("checked", false ); - } - }); - $("#nsslapd-ldapimaptoentries").change(function() { if (this.checked){ $(".autobind-entry-attrs").show(); @@ -1524,7 +1485,7 @@ $(document).ready( function() { $("#create-inst-serverid").css("border-color", "red"); return; } - if (new_server_id.match(/^[#%:-A-Za-z0-9_]+$/g)) { + if (new_server_id.match(/^[#%:A-Za-z0-9_-]+$/g)) { setup_inf = setup_inf.replace('INST_NAME', new_server_id); } else { report_err($("#create-inst-serverid"), 'Instance name can only contain letters, numbers, and: # % : - _');
389-commits@lists.fedoraproject.org
-
pagure＠pagure.io