Merge branch 'master' of github.com:freescout-helpdesk/freescout into…

… dist
freescout-help-desk · Oct 8, 2023 · 3372305 · 3372305
2 parents b3f2cdd + 5f9c615
commit 3372305
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 4 deletions.
diff --git a/config/app.php b/config/app.php
@@ -18,7 +18,7 @@
     | or any other location as required by the application or its packages.
     */
 
-    'version' => '1.8.102',
+    'version' => '1.8.103',
 
     /*
     |--------------------------------------------------------------------------

diff --git a/public/js/main.js b/public/js/main.js
@@ -4916,6 +4916,12 @@ function initModulesList()
 				}, true
 			);
 		});
+
+		$('.install-module-form').submit(function(e) {
+			installModule($(this).attr('data-module-alias'));
+			e.preventDefault();
+			return false;
+		});
 	});
 }
 

diff --git a/resources/views/modules/partials/module_card.blade.php b/resources/views/modules/partials/module_card.blade.php
@@ -41,7 +41,7 @@
 				@elseif (!empty($module['activated']))
 					<button type="submit" class="btn btn-primary activate-trigger" data-loading-text="{{ __('Activating') }}…">{{ __('Activate') }}</button>
 				@else
-					<form action="javascript:installModule('{{ $module['alias'] }}');">
+					<form action="" class="install-module-form" data-module-alias="{{ $module['alias'] }}">
 					<div class="input-group">
 						<input type="text" class="form-control license-key" placeholder="{{ __('License Key') }}" value="{{ App\Module::getLicense($module['alias']) }}" required="required">
 						<span class="input-group-btn">

diff --git a/resources/views/vendor/translation-manager/content.php b/resources/views/vendor/translation-manager/content.php
@@ -252,10 +252,10 @@ class="glyphicon glyphicon-trash"></span></a>
                         &nbsp;&nbsp;
                         <button type="submit" class="btn btn-primary" data-disable-with="Sending…" >Publish and Send to <?php echo \Config::get('app.name') ?> Team</button>
                     </form>
-                    <form class="form-inline form-download pull-left" method="POST" target="_blank" action="<?php echo action('TranslateController@postDownload') ?>" onsubmit="javascript:confirm('This will publish translations and download them as ZIP archive.');">
+                    <form class="form-inline form-download pull-left" method="POST" target="_blank" action="<?php echo action('TranslateController@postDownload') ?>">
                         <input type="hidden" name="_token" value="<?php echo csrf_token(); ?>">
 
-                        <button type="submit" class="btn btn-link" data-disable-with="Preparing…" title="Download translations as ZIP archive">Download as ZIP</button>
+                        <button type="submit" class="btn btn-link form-download-trigger" data-disable-with="Preparing…" title="Download translations as ZIP archive">Download as ZIP</button>
                     </form>
                     <form class="form-inline form-remove-unpublished pull-left" method="POST" action="<?php echo action('TranslateController@postRemoveUnpublished') ?>" data-remote="true" role="form" data-confirm="Are you sure you want to remove all translations which has not been published yet?">
                         <input type="hidden" name="_token" value="<?php echo csrf_token(); ?>">

diff --git a/resources/views/vendor/translation-manager/index.blade.php b/resources/views/vendor/translation-manager/index.blade.php
@@ -124,5 +124,12 @@
             $('div.success-remove-unpublished').slideDown();
         });
 
+        $('.form-download-trigger').click(function(e) {
+            if (confirm('This will publish translations and download them as ZIP archive.')) {
+                return true;
+            } else {
+                e.preventDefault();
+            }
+        });
     })
 @endsection