Selects are working in user management with generic confirm dialog

cps/admin.py

@@ -440,6 +440,14 @@ def load_dialogtexts(element_id):
         texts["main"] = _('Do you really want to delete this user?')
     elif element_id == "delete_shelf":
         texts["main"] = _('Are you sure you want to delete this shelf?')
+    elif element_id == "select_locale":
+        texts["main"] = _('Are you sure you want to change locales of selected user(s)?')
+    elif element_id == "select_default_language":
+        texts["main"] = _('Are you sure you want to change visible book languages for selected user(s)?')
+    elif element_id == "role":
+        texts["main"] = _('Are you sure you want to change the selected role for the selected user(s)?')
+    elif element_id == "sidebar_view":
+        texts["main"] = _('Are you sure you want to change the selected visibility restrictions for the selected user(s)?')
     return json.dumps(texts)
 
 

cps/static/js/main.js

@@ -114,26 +114,23 @@ $(document).ready(function() {
   }
 });
 
-function confirmDialog(id, dataValue, yesFn, noFn) {
+function confirmDialog(id, dialogid, dataValue, yesFn, noFn) {
-    var $confirm = $("#GeneralDeleteModal");
+    var $confirm = $("#" + dialogid);
-    // var dataValue= e.data('value'); // target.data('value');
     $confirm.modal('show');
     $.ajax({
         method:"get",
         dataType: "json",
         url: getPath() + "/ajax/loaddialogtexts/" + id,
         success: function success(data) {
-            $("#header").html(data.header);
+            $("#header-"+ dialogid).html(data.header);
-            $("#text").html(data.main);
+            $("#text-"+ dialogid).html(data.main);
         }
     });
-
+    $("#btnConfirmYes-"+ dialogid).off('click').click(function () {
-
-    $("#btnConfirmYes").off('click').click(function () {
         yesFn(dataValue);
         $confirm.modal("hide");
     });
-    $("#btnConfirmNo").off('click').click(function () {
+    $("#btnConfirmNo-"+ dialogid).off('click').click(function () {
         if (typeof noFn !== 'undefined') {
             noFn(dataValue);
         }
@@ -483,6 +480,7 @@ $(function() {
     $("#config_delete_kobo_token").click(function() {
         confirmDialog(
             $(this).attr('id'),
+            "GeneralDeleteModal",
             $(this).data('value'),
             function (value) {
                 $.ajax({
@@ -511,6 +509,7 @@ $(function() {
     $("#btndeluser").click(function() {
         confirmDialog(
             $(this).attr('id'),
+            "GeneralDeleteModal",
             $(this).data('value'),
             function(value){
                 var subform = $('#user_submit').closest("form");
@@ -529,6 +528,7 @@ $(function() {
     $("#delete_shelf").click(function() {
         confirmDialog(
             $(this).attr('id'),
+            "GeneralDeleteModal",
             $(this).data('value'),
             function(value){
                 window.location.href = window.location.pathname + "/../../shelf/delete/" + value

cps/static/js/table.js

@@ -237,12 +237,12 @@ $(function() {
     }
     $("#domain-allow-table").on("click-cell.bs.table", function (field, value, row, $element) {
         if (value === 2) {
-            confirmDialog("btndeletedomain", $element.id, domainHandle);
+            confirmDialog("btndeletedomain", "GeneralDeleteModal", $element.id, domainHandle);
         }
     });
     $("#domain-deny-table").on("click-cell.bs.table", function (field, value, row, $element) {
         if (value === 2) {
-            confirmDialog("btndeletedomain", $element.id, domainHandle);
+            confirmDialog("btndeletedomain", "GeneralDeleteModal", $element.id, domainHandle);
         }
     });
 
@@ -508,7 +508,7 @@ $(function() {
 
     $("#user-table").on("click-cell.bs.table", function (field, value, row, $element) {
         if (value === "denied_column_value") {
-            ConfirmDialog("btndeluser", $element.id, user_handle);
+            ConfirmDialog("btndeluser", "GeneralDeleteModal", $element.id, user_handle);
         }
     });
 
@@ -621,21 +621,7 @@ function checkboxChange(checkbox, userId, field, field_index) {
         }
     });
 }
-
+function deactivateHeaderButtons(e) {
-function selectHeader(element, field) {
-    var result = $('#user-table').bootstrapTable('getSelections').map(a => a.id);
-    $.ajax({
-        method:"post",
-        url: window.location.pathname + "/../../ajax/editlistusers/" + field,
-        data:  {"pk":result, "value": element.value},
-        success:function() {
-            $.ajax({
-                method:"get",
-                url: window.location.pathname + "/../../ajax/listusers",
-                async: true,
-                timeout: 900,
-                success:function(data) {
-                    $("#user-table").bootstrapTable("load", data);
     $("#user_delete_selection").addClass("disabled");
     $("#user_delete_selection").attr("aria-disabled", true);
     $(".check_head").attr("aria-disabled", true);
@@ -644,27 +630,47 @@ function selectHeader(element, field) {
     $(".button_head").attr("aria-disabled", true);
     $(".button_head").addClass("disabled");
     $(".header_select").attr("disabled", true);
-                }
+}
-            });
-        }
-    });
 
-   console.log("test");
+function selectHeader(element, field) {
+    if (element.value !== "None") {
+        confirmDialog(element.id, "GeneralChangeModal", 0, function () {
+            var result = $('#user-table').bootstrapTable('getSelections').map(a => a.id);
+            $.ajax({
+                method: "post",
+                url: window.location.pathname + "/../../ajax/editlistusers/" + field,
+                data: {"pk": result, "value": element.value},
+                success: function () {
+                    $.ajax({
+                        method: "get",
+                        url: window.location.pathname + "/../../ajax/listusers",
+                        async: true,
+                        timeout: 900,
+                        success: function (data) {
+                            $("#user-table").bootstrapTable("load", data);
+                            deactivateHeaderButtons();
+                        }
+                    });
+                }
+            });
+        });
+    }
 }
 
 function checkboxHeader(CheckboxState, field, field_index) {
+    confirmDialog(field, "GeneralChangeModal", 0, function() {
         var result = $('#user-table').bootstrapTable('getSelections').map(a => a.id);
         $.ajax({
-        method:"post",
+            method: "post",
             url: window.location.pathname + "/../../ajax/editlistusers/" + field,
-        data:  {"pk":result, "field_index":field_index, "value": CheckboxState},
+            data: {"pk": result, "field_index": field_index, "value": CheckboxState},
-        success:function() {
+            success: function () {
                 $.ajax({
-                method:"get",
+                    method: "get",
                     url: window.location.pathname + "/../../ajax/listusers",
                     async: true,
                     timeout: 900,
-                success:function(data) {
+                    success: function (data) {
                         $("#user-table").bootstrapTable("load", data);
                         $("#user_delete_selection").addClass("disabled");
                         $("#user_delete_selection").attr("aria-disabled", true);
@@ -678,6 +684,7 @@ function checkboxHeader(CheckboxState, field, field_index) {
                 });
             }
         });
+    });
 }
 
 function user_handle (userId) {

cps/templates/layout.html

@@ -1,4 +1,4 @@
-{% from 'modal_dialogs.html' import restrict_modal, delete_book, filechooser_modal, delete_confirm_modal %}
+{% from 'modal_dialogs.html' import restrict_modal, delete_book, filechooser_modal, delete_confirm_modal, change_confirm_modal %}
 <!DOCTYPE html>
 <html lang="{{ g.user.locale }}">
   <head>

cps/templates/modal_dialogs.html

@@ -108,13 +108,31 @@
   <div class="modal-dialog modal-sm">
     <div class="modal-content">
       <div class="modal-header bg-danger text-center">
-      <span id="header"></span>
+      <span id="header-GeneralDeleteModal"></span>
       </div>
       <div class="modal-body text-center">
-        <span id="text"></span>
+        <span id="text-GeneralDeleteModal"></span>
           <p></p>
-        <button id="btnConfirmYes" type="button" class="btn btn btn-danger">{{_('Delete')}}</button>
+        <button id="btnConfirmYes-GeneralDeleteModal" type="button" class="btn btn btn-danger">{{_('Delete')}}</button>
-        <button id="btnConfirmNo" type="button" class="btn btn-default">{{_('Cancel')}}</button>
+        <button id="btnConfirmNo-GeneralDeleteModal" type="button" class="btn btn-default">{{_('Cancel')}}</button>
+      </div>
+    </div>
+  </div>
+</div>
+{% endmacro %}
+
+{% macro change_confirm_modal() %}
+<div id="GeneralChangeModal" class="modal fade" role="Dialog">
+  <div class="modal-dialog modal-sm">
+    <div class="modal-content">
+      <div class="modal-header bg-info text-center">
+      <span id="header-GeneralChangeModal"></span>
+      </div>
+      <div class="modal-body text-center">
+        <span id="text-GeneralChangeModal"></span>
+          <p></p>
+        <button id="btnConfirmYes-GeneralChangeModal" type="button" class="btn btn btn-default">{{_('Ok')}}</button>
+        <button id="btnConfirmNo-GeneralChangeModal" type="button" class="btn btn-default">{{_('Cancel')}}</button>
       </div>
     </div>
   </div>

cps/templates/user_table.html

@@ -70,7 +70,7 @@
     {% if validate %}data-edit-validate="{{ _('This Field is Required') }}"{% endif %}>
     <div>
       <select id="select_{{ parameter }}" class="header_select" onchange="selectHeader(this, '{{parameter}}')" disabled="">
-      <option>{{_('Select...')}}</option>
+      <option value="None">{{_('Select...')}}</option>
       {% for translation in translations %}
         <option value="{{translation}}">{{translation.display_name|capitalize}}</option>
       {% endfor %}
@@ -137,6 +137,7 @@
 {% endblock %}
 {% block modal %}
 {{ delete_confirm_modal() }}
+{{ change_confirm_modal() }}
 {{ restrict_modal() }}
 {% endblock %}
 {% block js %}