Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 604765d5

Von Moritz Bunkus vor fast 12 Jahren hinzugefügt

  • ID 604765d5156076bdac2e2bf305ec287c6b0a0096
  • Vorgänger 4b211b2b
  • Nachfolger 29f99d33

Spalte 'cp_function' in 'cp_position' umbenennen zwecks Kompatibilität mit CRM

Unterschiede anzeigen:

SL/CT.pm
551 551

  
552 552
  my @columns = qw(cp_title cp_givenname cp_name cp_email cp_phone1 cp_phone2 cp_abteilung cp_fax
553 553
                   cp_mobile1 cp_mobile2 cp_satphone cp_satfax cp_project cp_privatphone cp_privatemail cp_birthday cp_gender
554
                   cp_street cp_zipcode cp_city cp_function);
554
                   cp_street cp_zipcode cp_city cp_position);
555 555
  my @values  = map(
556 556
    {
557 557
      if ( $_ eq 'cp_gender' ) {
......
1123 1123
    'vcnumber'  => 'vcnumber, cp_name, cp_givenname',
1124 1124
    );
1125 1125

  
1126
  my %sortcols  = map { $_ => 1 } qw(cp_name cp_givenname cp_phone1 cp_phone2 cp_mobile1 cp_email cp_street cp_zipcode cp_city cp_function vcname vcnumber);
1126
  my %sortcols  = map { $_ => 1 } qw(cp_name cp_givenname cp_phone1 cp_phone2 cp_mobile1 cp_email cp_street cp_zipcode cp_city cp_position vcname vcnumber);
1127 1127

  
1128 1128
  my $order_by  = $sortcols{$::form->{sort}} ? $::form->{sort} : 'cp_name';
1129 1129
  $::form->{sort} = $order_by;
SL/DB/MetaSetup/Contact.pm
34 34
    cp_zipcode     => { type => 'text' },
35 35
    cp_city        => { type => 'text' },
36 36
    cp_birthday    => { type => 'date' },
37
    cp_function    => { type => 'text' },
37
    cp_position    => { type => 'character', length => 75 },
38 38
  ],
39 39

  
40 40
  primary_key_columns => [ 'cp_id' ],
bin/mozilla/ct.pl
303 303

  
304 304
  my @columns      = qw(
305 305
    cp_id vcname vcnumber cp_name cp_givenname cp_street cp_zipcode cp_city cp_phone1 cp_phone2
306
    cp_mobile1 cp_mobile2 cp_email cp_abteilung cp_function cp_birthday cp_gender
306
    cp_mobile1 cp_mobile2 cp_email cp_abteilung cp_position cp_birthday cp_gender
307 307
  );
308 308

  
309 309
  my @includeable_custom_variables = grep { $_->{includeable} } @{ $cvar_configs };
......
336 336
    'cp_mobile2'   => { 'text' => $::locale->text('Mobile2'), },
337 337
    'cp_email'     => { 'text' => $::locale->text('E-mail'), },
338 338
    'cp_abteilung' => { 'text' => $::locale->text('Department'), },
339
    'cp_function'  => { 'text' => $::locale->text('Function/position'), },
339
    'cp_position'  => { 'text' => $::locale->text('Function/position'), },
340 340
    'cp_birthday'  => { 'text' => $::locale->text('Birthday'), },
341 341
    'cp_gender'    => { 'text' => $::locale->text('Gender'), },
342 342
    %column_defs_cvars,
sql/Pg-upgrade2/contacts_add_cp_function.sql
1
-- @tag: contacts_add_cp_function
2
-- @description: Feld 'Funktion/Position' zu Kontakten
3
-- @depends: release_3_0_0
4
-- @charset: utf-8
5
ALTER TABLE contacts ADD COLUMN cp_function text;
sql/Pg-upgrade2/contacts_add_cp_position.pl
1
# @tag: contacts_add_cp_position
2
# @description: Feld 'Funktion/Position' zu Kontakten
3
# @depends: release_3_0_0
4
# @charset: utf-8
5

  
6
package contacts_add_cp_position;
7
use strict;
8

  
9
die 'This script cannot be run from the command line.' if !$::form;
10

  
11
my $query = 'ALTER TABLE contacts ADD COLUMN cp_position VARCHAR(75)';
12

  
13
if (!$dbh->do($query)) {
14
  $dbh->rollback;
15
  $dbh->begin_work;
16
}
17

  
18
1;
templates/webpages/ct/_contact.html
37 37

  
38 38
     <tr>
39 39
      <th align="left" nowrap>[% 'Function/position' | $T8 %]</th>
40
      <td>[% L.input_tag('cp_function', cp_function, size=40) %]</td>
40
      <td>[% L.input_tag('cp_position', cp_position, size=40, maxlength=75) %]</td>
41 41
     </tr>
42 42

  
43 43
     <tr>
templates/webpages/ct/search_contact.html
113 113
        <label for="l_cp_abteilung">[% 'Department' | $T8 %]</label>
114 114
       </td>
115 115

  
116
       <td>[% L.checkbox_tag('l.cp_function', value='Y', label=LxERP.t8('Function/position'), class='checkbox') %]</td>
116
       <td>[% L.checkbox_tag('l.cp_position', value='Y', label=LxERP.t8('Function/position'), class='checkbox') %]</td>
117 117
      </tr>
118 118

  
119 119
      <tr>

Auch abrufbar als: Unified diff