View | Details | Raw Unified | Return to bug 10602
Collapse All | Expand All

(-)a/C4/AuthoritiesMarc.pm (-2 / +4 lines)
Lines 520-526 sub GetTagsLabels { Link Here
520
        $res->{$tag}->{repeatable} = $repeatable;
520
        $res->{$tag}->{repeatable} = $repeatable;
521
  }
521
  }
522
  $sth=      $dbh->prepare(
522
  $sth=      $dbh->prepare(
523
"SELECT tagfield,tagsubfield,liblibrarian,libopac,tab, mandatory, repeatable,authorised_value,frameworkcode as authtypecode,value_builder,kohafield,seealso,hidden,isurl 
523
"SELECT tagfield,tagsubfield,liblibrarian,libopac,tab, mandatory, repeatable,authorised_value,frameworkcode as authtypecode,value_builder,kohafield,seealso,hidden,isurl,defaultvalue
524
FROM auth_subfield_structure 
524
FROM auth_subfield_structure 
525
WHERE authtypecode=? 
525
WHERE authtypecode=? 
526
ORDER BY tagfield,tagsubfield"
526
ORDER BY tagfield,tagsubfield"
Lines 535-546 ORDER BY tagfield,tagsubfield" Link Here
535
    my $hidden;
535
    my $hidden;
536
    my $isurl;
536
    my $isurl;
537
    my $link;
537
    my $link;
538
    my $defaultvalue;
538
539
539
    while (
540
    while (
540
        ( $tag,         $subfield,   $liblibrarian,   , $libopac,      $tab,
541
        ( $tag,         $subfield,   $liblibrarian,   , $libopac,      $tab,
541
        $mandatory,     $repeatable, $authorised_value, $authtypecode,
542
        $mandatory,     $repeatable, $authorised_value, $authtypecode,
542
        $value_builder, $kohafield,  $seealso,          $hidden,
543
        $value_builder, $kohafield,  $seealso,          $hidden,
543
        $isurl,            $link )
544
        $isurl,         $defaultvalue, $link )
544
        = $sth->fetchrow
545
        = $sth->fetchrow
545
      )
546
      )
546
    {
547
    {
Lines 556-561 ORDER BY tagfield,tagsubfield" Link Here
556
        $res->{$tag}->{$subfield}->{hidden}           = $hidden;
557
        $res->{$tag}->{$subfield}->{hidden}           = $hidden;
557
        $res->{$tag}->{$subfield}->{isurl}            = $isurl;
558
        $res->{$tag}->{$subfield}->{isurl}            = $isurl;
558
        $res->{$tag}->{$subfield}->{link}            = $link;
559
        $res->{$tag}->{$subfield}->{link}            = $link;
560
        $res->{$tag}->{$subfield}->{defaultvalue}     = $defaultvalue;
559
    }
561
    }
560
    return $res;
562
    return $res;
561
}
563
}
(-)a/admin/auth_subfields_structure.pl (-2 / +7 lines)
Lines 139-144 if ($op eq 'add_form') { Link Here
139
	while ($data =$sth->fetchrow_hashref) {
139
	while ($data =$sth->fetchrow_hashref) {
140
140
141
		my %row_data;  # get a fresh hash for the row data
141
		my %row_data;  # get a fresh hash for the row data
142
        $row_data{defaultvalue} = $data->{defaultvalue};
142
		$row_data{tab} = CGI::scrolling_list(-name=>'tab',
143
		$row_data{tab} = CGI::scrolling_list(-name=>'tab',
143
					-id=>"tab$i",
144
					-id=>"tab$i",
144
                                        -values =>
145
                                        -values =>
Lines 386-394 if ($op eq 'add_form') { Link Here
386
	$template->param(tagfield => "$input->param('tagfield')");
387
	$template->param(tagfield => "$input->param('tagfield')");
387
#	my $sth=$dbh->prepare("replace auth_subfield_structure (authtypecode,tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,kohafield,tab,seealso,authorised_value,frameworkcode,value_builder,hidden,isurl)
388
#	my $sth=$dbh->prepare("replace auth_subfield_structure (authtypecode,tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,kohafield,tab,seealso,authorised_value,frameworkcode,value_builder,hidden,isurl)
388
#									values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
389
#									values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
389
	my $sth_insert = $dbh->prepare("insert into auth_subfield_structure (authtypecode,tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,kohafield,tab,seealso,authorised_value,frameworkcode,value_builder,hidden,isurl)
390
	my $sth_insert = $dbh->prepare("insert into auth_subfield_structure (authtypecode,tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,kohafield,tab,seealso,authorised_value,frameworkcode,value_builder,hidden,isurl,defaultvalue)
390
									values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
391
									values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
391
	my $sth_update = $dbh->prepare("update auth_subfield_structure set authtypecode=?, tagfield=?, tagsubfield=?, liblibrarian=?, libopac=?, repeatable=?, mandatory=?, kohafield=?, tab=?, seealso=?, authorised_value=?, frameworkcode=?, value_builder=?, hidden=?, isurl=?
392
	my $sth_update = $dbh->prepare("update auth_subfield_structure set authtypecode=?, tagfield=?, tagsubfield=?, liblibrarian=?, libopac=?, repeatable=?, mandatory=?, kohafield=?, tab=?, seealso=?, authorised_value=?, frameworkcode=?, value_builder=?, hidden=?, isurl=?, defaultvalue=?
392
									where authtypecode=? and tagfield=? and tagsubfield=?");
393
									where authtypecode=? and tagfield=? and tagsubfield=?");
393
	my @tagsubfield	= $input->param('tagsubfield');
394
	my @tagsubfield	= $input->param('tagsubfield');
394
	my @liblibrarian	= $input->param('liblibrarian');
395
	my @liblibrarian	= $input->param('liblibrarian');
Lines 404-409 if ($op eq 'add_form') { Link Here
404
	my $authtypecode	= $input->param('authtypecode');
405
	my $authtypecode	= $input->param('authtypecode');
405
	my @frameworkcodes	= $input->param('frameworkcode');
406
	my @frameworkcodes	= $input->param('frameworkcode');
406
	my @value_builder	=$input->param('value_builder');
407
	my @value_builder	=$input->param('value_builder');
408
    my @defaultvalue = $input->param('defaultvalue');
407
	for (my $i=0; $i<= $#tagsubfield ; $i++) {
409
	for (my $i=0; $i<= $#tagsubfield ; $i++) {
408
		my $tagfield			=$input->param('tagfield');
410
		my $tagfield			=$input->param('tagfield');
409
		my $tagsubfield		=$tagsubfield[$i];
411
		my $tagsubfield		=$tagsubfield[$i];
Lines 418-423 if ($op eq 'add_form') { Link Here
418
		my $authorised_value		=$authorised_values[$i];
420
		my $authorised_value		=$authorised_values[$i];
419
		my $frameworkcode		=$frameworkcodes[$i];
421
		my $frameworkcode		=$frameworkcodes[$i];
420
		my $value_builder=$value_builder[$i];
422
		my $value_builder=$value_builder[$i];
423
        my $defaultvalue = $value_builder[$i];
421
		#my $hidden = $ohidden[$i].$ihidden[$i].$ehidden[$i]; #collate from 3 hiddens;
424
		#my $hidden = $ohidden[$i].$ihidden[$i].$ehidden[$i]; #collate from 3 hiddens;
422
		my $hidden = $ohidden[$i]; #collate from 3 hiddens;
425
		my $hidden = $ohidden[$i]; #collate from 3 hiddens;
423
		my $isurl = $input->param("isurl$i")?1:0;
426
		my $isurl = $input->param("isurl$i")?1:0;
Lines 440-445 if ($op eq 'add_form') { Link Here
440
						$value_builder,
443
						$value_builder,
441
						$hidden,
444
						$hidden,
442
						$isurl,
445
						$isurl,
446
                        $defaultvalue,
443
						(
447
						(
444
							$authtypecode,
448
							$authtypecode,
445
							$tagfield,
449
							$tagfield,
Lines 463-468 if ($op eq 'add_form') { Link Here
463
						$value_builder,
467
						$value_builder,
464
						$hidden,
468
						$hidden,
465
						$isurl,
469
						$isurl,
470
                        $defaultvalue,
466
					);
471
					);
467
				}
472
				}
468
			}
473
			}
(-)a/installer/data/mysql/kohastructure.sql (+1 lines)
Lines 56-61 CREATE TABLE `auth_subfield_structure` ( Link Here
56
  `linkid` tinyint(1) NOT NULL default 0,
56
  `linkid` tinyint(1) NOT NULL default 0,
57
  `kohafield` varchar(45) NULL default '',
57
  `kohafield` varchar(45) NULL default '',
58
  `frameworkcode` varchar(10) NOT NULL default '',
58
  `frameworkcode` varchar(10) NOT NULL default '',
59
  `defaultvalue` TEXT DEFAULT '',
59
  PRIMARY KEY  (`authtypecode`,`tagfield`,`tagsubfield`),
60
  PRIMARY KEY  (`authtypecode`,`tagfield`,`tagsubfield`),
60
  KEY `tab` (`authtypecode`,`tab`)
61
  KEY `tab` (`authtypecode`,`tab`)
61
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
62
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
(-)a/installer/data/mysql/updatedatabase.pl (+12 lines)
Lines 7139-7144 if ( CheckVersion($DBversion) ) { Link Here
7139
    SetVersion ($DBversion);
7139
    SetVersion ($DBversion);
7140
}
7140
}
7141
7141
7142
7143
7144
7145
$DBversion = "3.13.00.XXX";
7146
if ( CheckVersion($DBversion) ) {
7147
    $dbh->do(q|
7148
        ALTER TABLE auth_subfield_structure ADD COLUMN defaultvalue TEXT DEFAULT NULL AFTER frameworkcode
7149
    |);
7150
    print "Upgrade to $DBversion done (Bug 10602: Add the column auth_subfield_structure.defaultvalue)\n";
7151
    SetVersion($DBversion);
7152
}
7153
7142
=head1 FUNCTIONS
7154
=head1 FUNCTIONS
7143
7155
7144
=head2 TableExists($table)
7156
=head2 TableExists($table)
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt (-2 / +12 lines)
Lines 99-105 function displayMoreConstraint(numlayer){ Link Here
99
                        </ol>
99
                        </ol>
100
                    </fieldset>
100
                    </fieldset>
101
                </li>
101
                </li>
102
                <li><label for="isurl[% loo.row %]">Is a URL:</label>[% loo.isurl %] (if checked, it means that the subfield is a URL and can be clicked)</li>
102
                <li>
103
                    <fieldset class="rows">
104
                        <legend>Advanced constraints:</legend>
105
                        <ol>
106
                            <li><label for="isurl[% loo.row %]">Is a URL:</label>[% loo.isurl %] (if checked, it means that the subfield is a URL and can be clicked)</li>
107
                            <li>
108
                                <label for="defaultvalue[% loo.row %]">Default value:</label>
109
                                <input type="text" name="defaultvalue" id="defaultvalue[% loo.row %]" value="[% loo.defaultvalue %]" />
110
                            </li>
111
                        </ol>
112
                    </fieldset>
113
                </li>
103
                <li>
114
                <li>
104
                    <fieldset><legend>Help input</legend>    
115
                    <fieldset><legend>Help input</legend>    
105
                        <ol>
116
                        <ol>
106
- 

Return to bug 10602