From 9e02b1f2cc044a1e161eb2e2dba2420d816d331a Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Fri, 20 Jan 2017 17:59:23 +0100 Subject: [PATCH] Angebots/Auftragssuche: keine Multibox verwenden --- bin/mozilla/oe.pl | 2 ++ templates/webpages/oe/search.html | 35 ++++++------------------------- 2 files changed, 8 insertions(+), 29 deletions(-) diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl index a38f04baa..e1f7f3a22 100644 --- a/bin/mozilla/oe.pl +++ b/bin/mozilla/oe.pl @@ -793,6 +793,8 @@ sub search { $form->{ORDER_PROBABILITIES} = [ map { { title => ($_ * 10) . '%', id => $_ * 10 } } (0..10) ]; + $::request->{layout}->use_javascript(map { "${_}.js" } qw(autocomplete_project)); + $form->header(); print $form->parse_html_template('oe/search', { diff --git a/templates/webpages/oe/search.html b/templates/webpages/oe/search.html index 1b9d615f6..50b04cb42 100644 --- a/templates/webpages/oe/search.html +++ b/templates/webpages/oe/search.html @@ -1,12 +1,14 @@ [%- USE HTML %] [%- USE T8 %] [%- USE LxERP %] -[%- USE L %] +[%- USE L %][%- USE P -%]

[% HTML.escape(title) %]

[%- SET vclabel = vc == 'customer' ? LxERP.t8('Customer') : LxERP.t8('Vendor') %] [%- SET vcnumberlabel = vc == 'customer' ? LxERP.t8('Customer Number') : LxERP.t8('Vendor Number') %] [%- SET vctypelabel = vc == 'customer' ? LxERP.t8('Customer type') : LxERP.t8('Vendor type') %] +[%- SET vcdefault = 'old' _ vc %] +[%- SET style="width: 250px" %]
@@ -16,21 +18,7 @@ - + @@ -76,19 +64,8 @@ - - + + -- 2.20.1
[% HTML.escape(vclabel) %] - [%- INCLUDE 'generic/multibox.html' - name = vc, - default = vc == 'customer' ? oldcustomer : oldvendor, - style = 'width: 250px', - DATA = ALL_VC, - id_sub = 'vc_keys', - label_key = 'name', - select = vc_select, - limit = MYCONFIG.vclimit, - show_empty = 1, - allow_textbox = 1, - class = 'initial_focus', - -%] - [% L.input_tag(vc, $vcdefault, style=style, class="initial_focus") %]
[% 'Contact Person' | $T8 %]
[% 'Project Number' | $T8 %] - [%- INCLUDE 'generic/multibox.html' - name = MYCONFIG.vclimit < ALL_PROJECTS.size ? 'projectnumber' : 'project_id', - style = "width: 250px", - DATA = ALL_PROJECTS, - id_key = 'id', - label_key = 'projectnumber', - limit = MYCONFIG.vclimit, - show_empty = 1, - allow_textbox = 1, - -%] - [% 'Project' | $T8 %][% P.project_picker("project_id", '', style=style) %] [% 'Part Number' | $T8 %]