diff --git a/editor.php b/editor.php index 6c1b8b85d..26871313e 100755 --- a/editor.php +++ b/editor.php @@ -175,9 +175,21 @@ if (empty($record) || !$has_access) { {( "name": "button", "type": "email", "id_module": "'.$id_module.'", "id_plugin": "'.$id_plugin.'", "id_record": "'.$id_record.'" )} - - '.(!empty($record['deleted_at']) ? tr('Salva e Ripristina') : tr('Salva')).' - +
+ + '.(!empty($record['deleted_at']) ? tr('Salva e ripristina') : tr('Salva')).' + + + +
@@ -191,6 +203,11 @@ if (empty($record) || !$has_access) { $("#save").click(function(){ //submitAjax(form); + $("#submit").trigger("click"); + }); + + $("#save-close").on("click", function (){ + form.find("[name=backto]").val("record-list"); $("#submit").trigger("click"); });'; diff --git a/modules/import/edit.php b/modules/import/edit.php index e8fe06afb..2732d5de5 100755 --- a/modules/import/edit.php +++ b/modules/import/edit.php @@ -151,10 +151,13 @@ $(document).ready(function() {'; } echo ' - $("#save").html(" '.tr('Avvia importazione').'"); + $("#save-buttons").find(".dropdown-menu, .dropdown-toggle").remove(); - $("#save").unbind("click"); - $("#save").on("click", function() { + var save = $("#save"); + save.html(" '.tr('Avvia importazione').'"); + + save.unbind("click"); + save.on("click", function() { count = 0; importPage(0); }); diff --git a/modules/primanota/movimenti.php b/modules/primanota/movimenti.php index dd4c9c6e7..bf4ba691e 100755 --- a/modules/primanota/movimenti.php +++ b/modules/primanota/movimenti.php @@ -221,11 +221,11 @@ function controllaConti() { if (continuare) { $("#add-submit").prop("disabled", false); $("#modello-button").prop("disabled", false); - $("#save").removeAttr("disabled"); + $("#save, #save-close").removeAttr("disabled").removeClass("disabled"); } else { $("#add-submit").prop("disabled", true); $("#modello-button").prop("disabled", true); - $("#save").attr("disabled", "true"); + $("#save, #save-close").attr("disabled", "true").addClass("disabled"); } return continuare; diff --git a/modules/tipi_anagrafiche/edit.php b/modules/tipi_anagrafiche/edit.php index ebb9113a3..4fc6e6974 100755 --- a/modules/tipi_anagrafiche/edit.php +++ b/modules/tipi_anagrafiche/edit.php @@ -34,7 +34,7 @@ if (!empty($record['default'])) { echo ' diff --git a/modules/utenti/edit.php b/modules/utenti/edit.php index 2f529ec44..8e294fdd8 100755 --- a/modules/utenti/edit.php +++ b/modules/utenti/edit.php @@ -209,7 +209,7 @@ if ($record['editable'] == 1) { echo ' ';