Update for new Hallinta

[misc/hallinta-metro] / artikel.php

diff --git a/artikel.php b/artikel.php
index 2f46f19..a9e6cda 100644 (file)
--- a/artikel.php
+++ b/artikel.php
@@ -2,7 +2,10 @@
 
 JavaScript::instance()->file('lib/rico3/minsrc/ricoLiveGridControls.js');
 JavaScript::instance()->add("Hallinta.closeDialogAfterInsert = false;");
+JavaScript::instance()->add("Hallinta.closeDialogAfterSave = false;");
+JavaScript::instance()->add("Hallinta.fetchItemAfterInsert = true;");
 JavaScript::instance()->add("Hallinta.postFetch = function(data){\$('#edit_artnr').select();};");
+JavaScript::instance()->add("Hallinta.postLoadForm = artikel_init_form;");
 
 Styles::instance()->add("
 div#form_price {
@@ -155,13 +158,20 @@ function add_price(obj)
 
     return false;
 }
+
+function artikel_init_form()
+{
+  $('#button_save').attr('onclick','').prop('onclick',null).off('click');
+  $('#button_save').click(function () {return custom_save(this);});
+  $('#button_insert').attr('onclick','').prop('onclick',null).off('click');
+  $('#button_insert').click(function () {return custom_insert(this);});
+}
+
 EOC;
 
 $jscode = str_replace('CONTENT_FORM', str_replace(array("\n"),
                                                  array("\\\n"), $form), $jscode);
 JavaScript::instance()->add($jscode);
-JavaScript::instance()->onLoad("\$('#button_save').click(function () {return custom_save(this);});");
-JavaScript::instance()->onLoad("\$('#button_insert').click(function () {return custom_insert(this);});");
 
 $buttons = <<<EOC
 <p style="margin-top: 5px; margin-bottom: 4px; text-align: center;">