Add submit button to redirect Load clipboard to View clipboard. (#1889)

artefactual · Nov 13, 2024 · 3b6aa76 · 3b6aa76
1 parent fb71ba7
commit 3b6aa76
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/apps/qubit/modules/clipboard/templates/loadSuccess.php b/apps/qubit/modules/clipboard/templates/loadSuccess.php
@@ -37,7 +37,8 @@
 
     <section class="actions">
       <ul>
-        <li><input class="c-btn c-btn-submit" type="submit" value="<?php echo __('Load'); ?>"/></li>
+        <li><input class="c-btn c-btn-submit" name="load" type="submit" value="<?php echo __('Load'); ?>"/></li>
+        <li><input class="c-btn c-btn-submit" name="loadView" type="submit" value="<?php echo __('Load and view'); ?>"/></li>
       </ul>
     </section>
 

diff --git a/js/clipboard.js b/js/clipboard.js
@@ -49,6 +49,7 @@
 
       var $form = $(event.target);
       var mode = $form.find('select#mode').val();
+      var loadType = $(document.activeElement).attr("name");
 
       $.ajax({
         url: $form.attr('action'),
@@ -82,6 +83,10 @@
           this.storage.setItem('clipboard', JSON.stringify(this.items));
           this.updateCounts();
           this.showAlert(data.success, 'alert-info');
+
+          if (loadType == "loadView") {
+            window.location.href = "/clipboard/view";
+          }
         },
         error: function(xhr)
         {

diff --git a/plugins/arDominionB5Plugin/js/clipboard.js b/plugins/arDominionB5Plugin/js/clipboard.js
@@ -62,6 +62,7 @@ import Tooltip from "bootstrap/js/dist/tooltip";
 
       var $form = $(event.target);
       var mode = $form.find("select#mode").val();
+      var loadType = $(document.activeElement).attr("name");
 
       $.ajax({
         url: $form.attr("action"),
@@ -87,6 +88,10 @@ import Tooltip from "bootstrap/js/dist/tooltip";
           this.storage.setItem("clipboard", JSON.stringify(this.items));
           this.updateCounts();
           this.showAlert(data.success, "alert-info");
+
+          if (loadType == "loadView") {
+            window.location.href = "/clipboard/view";
+          }
         },
         error: function (xhr) {
           var data = JSON.parse(xhr.responseText);

diff --git a/plugins/arDominionB5Plugin/modules/clipboard/templates/loadSuccess.php b/plugins/arDominionB5Plugin/modules/clipboard/templates/loadSuccess.php
@@ -33,9 +33,10 @@
       </div>
     </div>
 
-    <section class="actions mb-3">
-      <input class="btn atom-btn-outline-success" type="submit" value="<?php echo __('Load'); ?>">
-    </section>
+    <ul class="actions mb-3 nav gap-2">
+      <li><input class="btn atom-btn-outline-light" type="submit" name="load" value="<?php echo __('Load'); ?>"/></li>
+      <li><input class="btn atom-btn-outline-light" type="submit" name="loadView" value="<?php echo __('Load and view'); ?>"/></li>
+    </ul>
 
   </form>