Dialogbuchung: Bei Verbleib in der Maske nach Buchen Dokumenten-Tab laden

diff --git a/bin/mozilla/gl.pl b/bin/mozilla/gl.pl
index dbaddc596de7e273f27f31997fd2f6b4e97aed20..6f519428bba2c221d1c72995b35e2edddf961356 100644 (file)
--- a/bin/mozilla/gl.pl
+++ b/bin/mozilla/gl.pl
@@ -1402,7 +1402,7 @@ sub post_transaction {
     print $form->redirect_header($form->{callback});
     $form->redirect($locale->text('GL transaction posted.') . ' ' . $locale->text('ID') . ': ' . $form->{id});
   } elsif ($::instance_conf->get_gl_add_doc && $::instance_conf->get_doc_storage) {
-    my $add_doc_url = build_std_url("script=gl.pl", 'action=edit', 'id=' . E($form->{id}));
+    my $add_doc_url = build_std_url("script=gl.pl", 'action=edit', 'id=' . E($form->{id}), 'fragment=ui-tabs-docs');
     print $form->redirect_header($add_doc_url);
     $form->redirect($locale->text('GL transaction posted.') . ' ' . $locale->text('ID') . ': ' . $form->{id});
   }

diff --git a/js/kivi.File.js b/js/kivi.File.js
index bdd7acd361e205a9607cfa5138d9ced7832d93aa..63a85346c7a6c5f21ce8dd17aa87c92543539994 100644 (file)
--- a/js/kivi.File.js
+++ b/js/kivi.File.js
@@ -393,4 +393,20 @@ namespace('kivi.File', function(ns) {
     $('.overlay_div img').on('click', ns.download);
   };
 
+  ns.doc_tab_init = function(tabs_id, doc_tab_id, id, object_type) {
+    var url = 'controller.pl?action=File/list&file_type=document&object_type=' + object_type  + '&object_id=' + $('#id').val();
+
+    $('#' + tabs_id).on('tabsbeforeactivate', function(e, ui) {
+      if (ui.newPanel.attr('id') !== doc_tab_id) return;
+      $('#' + doc_tab_id).html(kivi.t8('Loading...'));
+      $('#' + doc_tab_id).load(url);
+    });
+
+    $('#' + tabs_id).on('tabscreate', function(e, ui) {
+      if (ui.panel.attr('id') !== doc_tab_id) return;
+      $('#' + doc_tab_id).html(kivi.t8('Loading...'));
+      $('#' + doc_tab_id).load(url);
+    });
+  };
+
 });

diff --git a/js/kivi.GL.js b/js/kivi.GL.js
index 374113c5404fbf4306a341fe64b5a4e2e2a1d4c5..dc17ff38f7e7640cae731d0dc37db5414cb84acf 100644 (file)
--- a/js/kivi.GL.js
+++ b/js/kivi.GL.js
@@ -29,3 +29,7 @@ namespace('kivi.GL', function(ns) {
     });
   };
 });
+
+$(function() {
+  kivi.File.doc_tab_init('gl_tabs', 'ui-tabs-docs', $('#id').val(), 'gl_transaction');
+});

diff --git a/js/locale/de.js b/js/locale/de.js
index 7e9a60b42a34afcd04bd7b291ee035a2180ebba9..e36f8829e8b1dd125b1592c2e089680e6135396c 100644 (file)
--- a/js/locale/de.js
+++ b/js/locale/de.js
@@ -89,6 +89,7 @@ namespace("kivi").setupLocale({
 "July":"Juli",
 "Jun":"Jun",
 "June":"Juni",
+"Loading...":"Wird geladen...",
 "Map":"Karte",
 "Mar":"März",
 "March":"März",

diff --git a/js/locale/en.js b/js/locale/en.js
index 81da3f9f52c0aff25b9edd33bf1377e372735295..b03ddb34bc37abf002c5ade045c1a4d7a58900c2 100644 (file)
--- a/js/locale/en.js
+++ b/js/locale/en.js
@@ -89,6 +89,7 @@ namespace("kivi").setupLocale({
 "July":"",
 "Jun":"",
 "June":"",
+"Loading...":"",
 "Map":"",
 "Mar":"",
 "March":"",

diff --git a/templates/webpages/gl/form_header.html b/templates/webpages/gl/form_header.html
index cbfaddbe7ababf232aaefd497a227e0c57941be2..dad0d69cf81b1fd118021d091d53e5d5e9ec484c 100644 (file)
--- a/templates/webpages/gl/form_header.html
+++ b/templates/webpages/gl/form_header.html
@@ -31,7 +31,7 @@
 <input type="hidden" name="follow_up_trans_info_1" value="[% id | html %]">
 <input type="hidden" name="follow_up_rowcount" value="1">
 
-<div id="ir_tabs" class="tabwidget">
+<div id="gl_tabs" class="tabwidget">
  <ul>
   <li><a href="#ui-tabs-basic-data">[% 'Basic Data' | $T8 %]</a></li>
 [%- IF INSTANCE_CONF.get_webdav %]
@@ -39,11 +39,16 @@
 [%- END %]
 [%- IF id %]
 [%- IF INSTANCE_CONF.get_doc_storage %]
-  <li><a href="controller.pl?action=File/list&file_type=document&object_type=gl_transaction&object_id=[% HTML.url(id) %]">[% 'Documents' | $T8 %]</a></li>
+  <li><a href="#ui-tabs-docs">[% 'Documents' | $T8 %]</a></li>
   <li><a href="controller.pl?action=File/list&file_type=attachment&object_type=gl_transaction&object_id=[% HTML.url(id) %]">[% 'Attachments' | $T8 %]</a></li>
 [%- END %]
 [%- END %]
  </ul>
+
+[%- IF INSTANCE_CONF.get_doc_storage %]
+  <div id="ui-tabs-docs"></div>
+[%- END %]
+
  <div id="ui-tabs-basic-data">
 
 <table width=100%>