projects / kivitendo-erp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5bc7284)
bp delete confirm und checkall ins template verschoben.
authorSven Schöling <s.schoeling@linet-services.de>
Fri, 23 Sep 2011 12:24:44 +0000 (14:24 +0200)
committerSven Schöling <s.schoeling@linet-services.de>
Fri, 23 Sep 2011 12:27:42 +0000 (14:27 +0200)
bin/mozilla/bp.pl patch | blob | history
templates/webpages/bp/list_spool.html patch | blob | history

diff --git a/bin/mozilla/bp.pl b/bin/mozilla/bp.pl
index 8f34b19..1d9d79f 100644 (file)
--- a/bin/mozilla/bp.pl
+++ b/bin/mozilla/bp.pl
@@ -44,8 +44,6 @@ use strict;
 # end of main
 
 sub assert_bp_access {
-  my $form     = $main::form;
-
   my %access_map = (
     'invoice'           => 'invoice_edit',
     'sales_order'       => 'sales_order_edit',
@@ -56,11 +54,11 @@ sub assert_bp_access {
     'receipt'           => 'cash',
   );
 
-  if ($form->{type} && $access_map{$form->{type}}) {
-    $main::auth->assert($access_map{$form->{type}});
+  if ($::form->{type} && $access_map{$::form->{type}}) {
+    $::auth->assert($access_map{$::form->{type}});
 
   } else {
-    $main::auth->assert('DOES_NOT_EXIST');
+    $::auth->assert('DOES_NOT_EXIST');
   }
 }
 
@@ -97,116 +95,51 @@ sub search {
 }
 
 sub remove {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my $locale   = $main::locale;
-
-  assert_bp_access();
-
-  my $selected = 0;
-
-  for my $i (1 .. $form->{rowcount}) {
-    if ($form->{"checked_$i"}) {
-      $selected = 1;
-      last;
-    }
-  }
-
-  $form->error('Nothing selected!') unless $selected;
-
-  $form->{title} = $locale->text('Confirm!');
-
-  $form->header;
-
-  print qq|
-<body>
-
-<form method=post action=bp.pl>
-|;
-
-  map { delete $form->{$_} } qw(action header);
-
-  foreach my $key (keys %$form) {
-    next if (($key eq 'login') || ($key eq 'password') || ('' ne ref $form->{$key}));
-    print qq|<input type=hidden name=$key value="$form->{$key}">\n|;
-  }
-
-  print qq|
-<h2 class=confirm>$form->{title}</h2>
-
-<h4>|
-    . $locale->text(
-          'Are you sure you want to remove the marked entries from the queue?')
-    . qq|</h4>
-
-<input name=action class=submit type=submit value="|
-    . $locale->text('Yes') . qq|">
-</form>
-
-</body>
-</html>
-|;
-
-  $main::lxdebug->leave_sub();
-}
-
-sub yes {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-  my $locale   = $main::locale;
-
+  $::lxdebug->enter_sub;
   assert_bp_access();
 
-  $form->info($locale->text('Removing marked entries from queue ...'));
-  $form->{callback} .= "&header=1" if $form->{callback};
+  $::form->info($::locale->text('Removing marked entries from queue ...'));
+  $::form->{callback} .= "&header=1" if $::form->{callback};
 
-  $form->redirect($locale->text('Removed spoolfiles!'))
-    if (BP->delete_spool(\%myconfig, \%$form));
-  $form->error($locale->text('Cannot remove files!'));
+  $::form->redirect($::locale->text('Removed spoolfiles!'))
+    if BP->delete_spool(\%::myconfig, $::form);
+  $::form->error($::locale->text('Cannot remove files!'));
 
-  $main::lxdebug->leave_sub();
+  $::lxdebug->leave_sub;
 }
 
 sub print {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-  my $locale   = $main::locale;
-
+  $::lxdebug->enter_sub;
   assert_bp_access();
 
-  $form->get_lists(printers => 'ALL_PRINTERS');
+  $::form->get_lists(printers => 'ALL_PRINTERS');
   # use the command stored in the databse or fall back to $myconfig{printer}
   my $selected_printer =  first { $_ } map ({ $_ ->{printer_command} }
-                                         grep { $_->{id} eq $form->{printer} }
-                                           @{ $form->{ALL_PRINTERS} }),
-                                       $myconfig{printer};
-
-  if ($form->{callback}) {
-    map { $form->{callback} .= "&checked_$_=1" if $form->{"checked_$_"} }
-      (1 .. $form->{rowcount});
-    $form->{callback} .= "&header=1";
+                                         grep { $_->{id} eq $::form->{printer} }
+                                           @{ $::form->{ALL_PRINTERS} }),
+                                       $::myconfig{printer};
+
+  if ($::form->{callback}) {
+    map { $::form->{callback} .= "&checked_$_=1" if $::form->{"checked_$_"} }
+      (1 .. $::form->{rowcount});
+    $::form->{callback} .= "&header=1";
   }
 
-  for my $i (1 .. $form->{rowcount}) {
-    if ($form->{"checked_$i"}) {
-      $form->info($locale->text('Printing ... '));
+  for my $i (1 .. $::form->{rowcount}) {
+    if ($::form->{"checked_$i"}) {
+      $::form->info($::locale->text('Printing ... '));
 
-      if (BP->print_spool(\%myconfig, \%$form, "| $selected_printer")) {
-        print $locale->text('done');
-        $form->redirect($locale->text('Marked entries printed!'));
+      if (BP->print_spool(\%::myconfig, $::form, "| $selected_printer")) {
+        print $::locale->text('done');
+        $::form->redirect($::locale->text('Marked entries printed!'));
       }
       ::end_of_request();
     }
   }
 
-  $form->error('Nothing selected!');
+  $::form->error('Nothing selected!');
 
-  $main::lxdebug->leave_sub();
+  $::lxdebug->leave_sub;
 }
 
 sub list_spool {
@@ -262,18 +195,5 @@ sub list_spool {
   $::lxdebug->leave_sub;
 }
 
-sub select_all {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-
-  assert_bp_access();
-
-  map { $form->{"checked_$_"} = 1 } (1 .. $form->{rowcount});
-  &list_spool;
-
-  $main::lxdebug->leave_sub();
-}
-
-sub continue { call_sub($main::form->{"nextsub"}); }
+sub continue { call_sub($::form->{"nextsub"}); }
 
diff --git a/templates/webpages/bp/list_spool.html b/templates/webpages/bp/list_spool.html
index 02e4b26..10855b3 100644 (file)
--- a/templates/webpages/bp/list_spool.html
+++ b/templates/webpages/bp/list_spool.html
@@ -3,7 +3,8 @@
 [%- USE LxERP %]
 [%- USE T8 %]
 [%- USE url %]
-[% SET list_spool__callback = href _ '&sort=' _ sort %]
+[%- SET list_spool__callback = href _ '&sort=' _ sort %]
+[% L.javascript_tag('jquery.checkall') %]
 <body>
 
 <h1>[% title | html %]</h1>
@@ -19,7 +20,7 @@
 
 <table width=100%>
  <tr>
-  <td class="listheading">&nbsp;</td>
+  <td class="listheading">[% L.checkbox_tag('checkall_box', checkall='input.check_all') %]</td>
   <td class="listheading">[% L.link(href _ '&sort=transdate', LxERP.t8('Date')) %]</td>
 [%- IF is_invoice %]
   <td class="listheading">[% L.link(href _ '&sort=invoice', LxERP.t8('Invoice')) %]</td>
@@ -35,7 +36,7 @@
  </tr>
 [%- FOREACH row = SPOOL %]
  <tr class="listrow[% loop.count %]">
-  <td>[% SET list_spool__checked='checked_' _ loop.count; L.checkbox_tag(list_spool__checked, checked=$list_spool__checked) IF row.new_file %]</td>
+  <td>[% SET list_spool__checked='checked_' _ loop.count; L.checkbox_tag(list_spool__checked, checked=$list_spool__checked, class='check_all') IF row.new_file %]</td>
   <td>[% row.transdate %]</td>
 [%- IF is_invoice %]
   <td>[% L.link(url(row.module _ '.pl', action='edit' ,type=type, callback=list_spool__callback, id=row.id), row.invnumber) %]</td>
@@ -73,7 +74,7 @@
 [% L.hidden_tag('customer', customer) %]
 [% L.hidden_tag('vendor', vendor) %]
 
-[% L.submit_tag('action', LxERP.t8('Remove')) %]
+[% L.submit_tag('action', LxERP.t8('Remove'), confirm=LxERP.t8('Are you sure you want to remove the marked entries from the queue?')) %]
 [% L.submit_tag('action', LxERP.t8('Print')) %]
 
 [% L.select_tag('printer', L.options_for_select(ALL_PRINTERS, title='printer_description')) %]
@@ -82,5 +83,3 @@
 
 </body>
 </html>
-
-
Unnamed repository; edit this file 'description' to name the repository.