Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 777d9b30

Von Sven Schöling vor etwa 15 Jahren hinzugefügt

  • ID 777d9b30c494c0a6dfd86e638c16ef8b27658ed9
  • Vorgänger d4b17776
  • Nachfolger 93618a69

Bugfix: Auftragssuche: Bei niedrigen vclimit muss nach projectNUMMER und nicht nach id gesucht werden.

Fix für Bug 1108

Unterschiede anzeigen:

SL/OE.pm
111 111
      qq|AND ((globalproject_id = ?) OR EXISTS | .
112 112
      qq|  (SELECT * FROM orderitems oi | .
113 113
      qq|   WHERE oi.project_id = ? AND oi.trans_id = o.id))|;
114
    push(@values, $form->{"project_id"}, $form->{"project_id"});
114
    push(@values, conv_i($form->{"project_id"}), conv_i($form->{"project_id"}));
115
  }
116

  
117
  if ($form->{"projectnumber"}) {
118
    $query .= <<SQL;
119
      AND (pr.projectnumber ILIKE ?) OR EXISTS (
120
        SELECT * FROM orderitems oi
121
        LEFT JOIN project proi ON proi.id = oi.project_id
122
        WHERE proi.projectnumber ILIKE ? AND oi.trans_id = o.id
123
      )
124
SQL
125
    push @values, "%" . $form->{"projectnumber"} . "%", "%" . $form->{"projectnumber"} . "%" ;
115 126
  }
116 127

  
117 128
  if ($form->{"${vc}_id"}) {
templates/webpages/oe/search_de.html
87 87
     <th align="right">Projektnummer</th>
88 88
     <td colspan="3">
89 89
            [%- INCLUDE 'generic/multibox.html'
90
                 name          = 'project_id',
90
                 name          =  vclimit < ALL_PROJECTS.size ? 'projectnumber' : 'project_id',
91 91
                 style         = "width: 250px",
92 92
                 DATA          =  ALL_PROJECTS,
93 93
                 id_key        = 'id',
templates/webpages/oe/search_master.html
87 87
     <th align="right"><translate>Project Number</translate></th>
88 88
     <td colspan="3">
89 89
            [%- INCLUDE 'generic/multibox.html'
90
                 name          = 'project_id',
90
                 name          =  vclimit < ALL_PROJECTS.size ? 'projectnumber' : 'project_id',
91 91
                 style         = "width: 250px",
92 92
                 DATA          =  ALL_PROJECTS,
93 93
                 id_key        = 'id',

Auch abrufbar als: Unified diff