Merge branch 'MDL-72952' of https://github.com/roland04/moodle

moodle · Nov 10, 2021 · d038fd8 · d038fd8
2 parents 2b18fad + 5a2624c
commit d038fd8
Show file tree

Hide file tree

Showing 11 changed files with 86 additions and 57 deletions.
diff --git a/lang/en/reportbuilder.php b/lang/en/reportbuilder.php
@@ -47,6 +47,7 @@
 $string['audiencedeleted'] = 'Deleted audience \'{$a}\'';
 $string['audiencemultiselectpostfix'] = '{$a->elements} plus {$a->morecount} more';
 $string['audiencenotsaved'] = 'Audience not saved';
+$string['audiencesaved'] = 'Audience saved';
 $string['columnadded'] = 'Added column \'{$a}\'';
 $string['columnaggregated'] = 'Aggregated column \'{$a}\'';
 $string['columndeleted'] = 'Deleted column \'{$a}\'';

diff --git a/reportbuilder/amd/build/audience.min.js b/reportbuilder/amd/build/audience.min.js
diff --git a/reportbuilder/amd/build/audience.min.js.map b/reportbuilder/amd/build/audience.min.js.map
diff --git a/reportbuilder/amd/src/audience.js b/reportbuilder/amd/src/audience.js
@@ -32,6 +32,7 @@ import {add as addToast} from 'core/toast';
 import {deleteAudience} from 'core_reportbuilder/local/repository/audiences';
 import * as reportSelectors from 'core_reportbuilder/local/selectors';
 import {loadFragment} from 'core/fragment';
+import {markFormAsDirty} from 'core_form/changechecker';
 
 let reportId = 0;
 let contextId = 0;
@@ -61,7 +62,9 @@ const addAudienceCard = (className, title) => {
             const audienceCard = Templates.appendNodeContents(audiencesContainer, html, js)[0];
             const audienceEmptyMessage = audiencesContainer.querySelector(reportSelectors.regions.audienceEmptyMessage);
 
-            initAudienceCardForm(audienceCard);
+            const audienceForm = initAudienceCardForm(audienceCard);
+            // Mark as dirty new audience form created to prevent users leaving the page without saving it.
+            markFormAsDirty(audienceForm.getFormNode());
             audienceEmptyMessage.classList.add('hidden');
 
             return getString('audienceadded', 'core_reportbuilder', title);
@@ -120,6 +123,9 @@ const initAudienceCardForm = audienceCard => {
         audienceDescription.innerHTML = data.detail.description;
 
         closeAudienceCardForm(audienceCard);
+
+        return getString('audiencesaved', 'core_reportbuilder')
+            .then(addToast);
     });
 
     // If cancelling the form, close the card or remove it if it was never created.

diff --git a/reportbuilder/templates/local/audience/form.mustache b/reportbuilder/templates/local/audience/form.mustache
@@ -45,13 +45,21 @@
                 </span>
                 <span class="ml-auto">
                     {{#canedit}}
-                        <button class="btn btn-link px-0" data-action="edit-audience" {{^description}}disabled{{/description}}>
-                            {{#pix}} i/settings, core, {{#str}} editaudience, core_reportbuilder, {{title}} {{/str}} {{/pix}}
+                        <button class="btn btn-link px-0"
+                                data-action="edit-audience"
+                                title="{{#str}} editaudience, core_reportbuilder, {{title}} {{/str}}"
+                                aria-label="{{#str}} editaudience, core_reportbuilder, {{title}} {{/str}}"
+                                {{^description}}disabled{{/description}}>
+                            {{#pix}} i/settings, core {{/pix}}
                         </button>
                     {{/canedit}}
                     {{#candelete}}
-                        <button class="btn btn-link px-0 mr-2" data-action="delete-audience" {{^description}}disabled{{/description}}>
-                            {{#pix}} i/trash, core, {{#str}} deleteaudience, core_reportbuilder, {{title}} {{/str}} {{/pix}}
+                        <button class="btn btn-link px-0 mr-2"
+                                data-action="delete-audience"
+                                title="{{#str}} deleteaudience, core_reportbuilder, {{title}} {{/str}}"
+                                aria-label="{{#str}} deleteaudience, core_reportbuilder, {{title}} {{/str}}"
+                                {{^description}}disabled{{/description}}>
+                            {{#pix}} i/trash, core {{/pix}}
                         </button>
                     {{/candelete}}
                 </span>

diff --git a/reportbuilder/templates/local/settings/area.mustache b/reportbuilder/templates/local/settings/area.mustache
@@ -72,7 +72,7 @@
     }
 }}
 
-<div class="reportbuilder-sidebar-settings sidebar collapse notransition" id="report-settings" style="min-width: 350px;">
+<div class="reportbuilder-sidebar-settings sidebar collapse" id="report-settings" style="min-width: 350px;">
     <div class="dropdown d-flex justify-content-end mb-2">
         <div class="mb-3 mt-2 mt-md-0 ml-md-3 w-100">
 

diff --git a/reportbuilder/templates/toggle_card.mustache b/reportbuilder/templates/toggle_card.mustache
@@ -46,7 +46,7 @@
             </button>
         </div>
     </div>
-    <div id="{{$id}}{{/id}}" class="notransition collapse {{$collapsed}}show{{/collapsed}}" aria-labelledby="{{$id}}{{/id}}-heading">
+    <div id="{{$id}}{{/id}}" class="collapse {{$collapsed}}show{{/collapsed}}" aria-labelledby="{{$id}}{{/id}}-heading">
         <div class="card-body p-0">
             {{$body}}{{/body}}
         </div>