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

(-)a/admin/auth_subfields_structure.pl (-130 / +49 lines)
Lines 17-24 Link Here
17
# You should have received a copy of the GNU General Public License
17
# You should have received a copy of the GNU General Public License
18
# along with Koha; if not, see <http://www.gnu.org/licenses>.
18
# along with Koha; if not, see <http://www.gnu.org/licenses>.
19
19
20
use strict;
20
use Modern::Perl;
21
#use warnings; FIXME - Bug 2505
22
use C4::Output;
21
use C4::Output;
23
use C4::Auth;
22
use C4::Auth;
24
use CGI qw ( -utf8 );
23
use CGI qw ( -utf8 );
Lines 52-58 my $input = new CGI; Link Here
52
my $tagfield     = $input->param('tagfield');
51
my $tagfield     = $input->param('tagfield');
53
my $tagsubfield  = $input->param('tagsubfield');
52
my $tagsubfield  = $input->param('tagsubfield');
54
my $authtypecode = $input->param('authtypecode');
53
my $authtypecode = $input->param('authtypecode');
55
my $offset       = $input->param('offset');
54
my $offset       = $input->param('offset') || 0;
56
my $op           = $input->param('op') || '';
55
my $op           = $input->param('op') || '';
57
my $script_name  = "/cgi-bin/koha/admin/auth_subfields_structure.pl";
56
my $script_name  = "/cgi-bin/koha/admin/auth_subfields_structure.pl";
58
57
Lines 84-91 my $dbh = C4::Context->dbh; Link Here
84
################## ADD_FORM ##################################
83
################## ADD_FORM ##################################
85
# called by default. Used to create form to add or  modify a record
84
# called by default. Used to create form to add or  modify a record
86
if ($op eq 'add_form') {
85
if ($op eq 'add_form') {
87
	my $data;
88
	my $more_subfields = $input->param("more_subfields")+1;
89
	# builds kohafield tables
86
	# builds kohafield tables
90
	my @kohafields;
87
	my @kohafields;
91
	push @kohafields, "";
88
	push @kohafields, "";
Lines 130-262 if ($op eq 'add_form') { Link Here
130
	$sth->execute($tagfield,$authtypecode);
127
	$sth->execute($tagfield,$authtypecode);
131
	my @loop_data = ();
128
	my @loop_data = ();
132
	my $i=0;
129
	my $i=0;
133
	while ($data =$sth->fetchrow_hashref) {
130
    while ( my $data = $sth->fetchrow_hashref ) {
134
131
        my %row_data;    # get a fresh hash for the row data
135
		my %row_data;  # get a fresh hash for the row data
132
        $row_data{defaultvalue}      = $data->{defaultvalue};
136
        $row_data{defaultvalue} = $data->{defaultvalue};
133
        $row_data{tab}               = $data->{tab};
137
        $row_data{tab} = {
134
        $row_data{ohidden}           = $data->{'hidden'};
138
                    id      => "tab$i",
135
        $row_data{tagsubfield}       = $data->{'tagsubfield'};
139
                    default => $data->{'tab'},
136
        $row_data{liblibrarian}      = $data->{'liblibrarian'};
140
                    };
137
        $row_data{libopac}           = $data->{'libopac'};
141
        $row_data{ohidden} = {
138
        $row_data{seealso}           = $data->{'seealso'};
142
                    id      => "ohidden$i",
139
        $row_data{kohafields}        = \@kohafields;
143
                    default => $data->{'hidden'}
140
        $row_data{kohafield}         = $data->{'kohafield'};
144
                    };
141
        $row_data{authorised_values} = $authorised_values;
145
		$row_data{tagsubfieldinput} = "<input type=\"hidden\" name=\"tagsubfield\" value=\"".$data->{'tagsubfield'}."\" id=\"tagsubfield\" />";
142
        $row_data{authorised_value}  = $data->{'authorised_value'};
146
		$row_data{tagsubfield} = $data->{'tagsubfield'};
143
        $row_data{frameworkcodes}    = \@authtypes;
147
		$row_data{liblibrarian} = CGI::escapeHTML($data->{'liblibrarian'});
144
        $row_data{frameworkcode}     = $data->{'frameworkcode'};
148
		$row_data{libopac} = CGI::escapeHTML($data->{'libopac'});
145
        $row_data{value_builders}    = \@value_builder;
149
		$row_data{seealso} = CGI::escapeHTML($data->{'seealso'});
146
        $row_data{value_builder}     = $data->{'value_builder'};
150
        $row_data{kohafield} = {
147
        $row_data{repeatable}        = $data->{repeatable};
151
                    id      => "kohafield$i",
148
        $row_data{mandatory}         = $data->{mandatory};
152
                    values  => \@kohafields,
149
        $row_data{hidden}            = $data->{hidden};
153
                    default => "$data->{'kohafield'}",
150
        $row_data{isurl}             = $data->{isurl};
154
                    };
151
        $row_data{row}               = $i;
155
        $row_data{authorised_value} = {
152
        push( @loop_data, \%row_data );
156
                    id      => "authorised_value$i",
153
        $i++;
157
                    values  => $authorised_values,
154
    }
158
                    default => $data->{'authorised_value'},
159
        };
160
        $row_data{frameworkcode} = {
161
                    id      => "frameworkcode$i",
162
                    values  => \@authtypes,
163
                    default => $data->{'frameworkcode'},
164
        };
165
        $row_data{value_builder} = {
166
                    id      => "value_builder$i",
167
                    values  => \@value_builder,
168
                    default => $data->{'value_builder'},
169
        };
170
		
171
		$row_data{repeatable} = CGI::checkbox(-name=>"repeatable$i",
172
	-checked => $data->{'repeatable'}?'checked':'',
173
	-value => 1,
174
	-label => '',
175
	-id => "repeatable$i");
176
		$row_data{mandatory} = CGI::checkbox(-name => "mandatory$i",
177
	-checked => $data->{'mandatory'}?'checked':'',
178
	-value => 1,
179
	-label => '',
180
	-id => "mandatory$i");
181
		$row_data{hidden} = CGI::escapeHTML($data->{hidden}) ;
182
		$row_data{isurl} = CGI::checkbox( -name => "isurl$i",
183
			-id => "isurl$i",
184
			-checked => $data->{'isurl'}?'checked':'',
185
			-value => 1,
186
			-label => '');
187
		$row_data{row} = $i;
188
		push(@loop_data, \%row_data);
189
		$i++;
190
	}
191
	# add more_subfields empty lines for add if needed
192
	for (my $i=1;$i<=$more_subfields;$i++) {
193
		my %row_data;  # get a fresh hash for the row data
194
        $row_data{'new_subfield'} = 1;
195
        $row_data{tab} = {
196
                    id      => "tab$i",
197
                    default => $data->{'tab'},
198
                    };
199
        $row_data{ohidden} = {
200
                    id      => "ohidden$i",
201
                    default => $data->{'hidden'}
202
                    };
203
155
204
		$row_data{tagsubfieldinput} = "<input type=\"text\" name=\"tagsubfield\" value=\"".$data->{'tagsubfield'}."\" size=\"1\" id=\"tagsubfield\" maxlength=\"1\" />";
156
    # Add a new row for the "New" tab
205
                $row_data{tagsubfieldinput} = 
157
    my %row_data;    # get a fresh hash for the row data
206
                        "<label><input type=\"text\" name=\"tagsubfield\" value=\""
158
    $row_data{'new_subfield'} = 1;
207
                        . $data->{'tagsubfield'}
159
    $row_data{tab} = -1; # ignore
208
                        . "\" size=\"1\" id=\"tagsubfield\" maxlength=\"1\" /></label>";
160
    $row_data{ohidden} = 0; # show all
209
		$row_data{tagsubfield} = $data->{'tagsubfield'};
161
    $row_data{tagsubfield}      = "";
210
		$row_data{liblibrarian} = "";
162
    $row_data{liblibrarian}     = "";
211
		$row_data{libopac} = "";
163
    $row_data{libopac}          = "";
212
		$row_data{seealso} = "";
164
    $row_data{seealso}          = "";
213
		$row_data{hidden} = "000";
165
    $row_data{hidden}           = "000";
214
		$row_data{repeatable} = CGI::checkbox( -name=> 'repeatable',
166
    $row_data{repeatable}       = 0;
215
				-id => "repeatable$i",
167
    $row_data{mandatory}        = 0;
216
				-checked => '',
168
    $row_data{isurl}            = 0;
217
				-value => 1,
169
    $row_data{kohafields} = \@kohafields,
218
				-label => '');
170
    $row_data{authorised_values} = $authorised_values;
219
		$row_data{mandatory} = CGI::checkbox( -name=> 'mandatory',
171
    $row_data{frameworkcodes} = \@authtypes;
220
			-id => "mandatory$i",
172
    $row_data{value_builders} = \@value_builder;
221
			-checked => '',
173
    $row_data{row} = $i;
222
			-value => 1,
174
    push( @loop_data, \%row_data );
223
			-label => '');
224
		$row_data{isurl} = CGI::checkbox(-name => 'isurl',
225
			-id => "isurl$i",
226
			-checked => '',
227
			-value => 1,
228
			-label => '');
229
        $row_data{kohafield} = {
230
                    id      => "kohafield$i",
231
                    values  => \@kohafields,
232
                    default => "",
233
                    };
234
        $row_data{authorised_value} = {
235
                    id      => "authorised_value",
236
                    values  => $authorised_values,
237
                    default => "",
238
        };
239
        $row_data{frameworkcode} = {
240
                    id      => "frameworkcode",
241
                    values  => \@authtypes,
242
                    default => $data->{'frameworkcode'},
243
        };
244
        $row_data{value_builder} = {
245
                    id      => "value_builder",
246
                    values  => \@value_builder,
247
                    default => $data->{'value_builder'},
248
        };
249
175
250
		$row_data{row} = $i;
251
		push(@loop_data, \%row_data);
252
	}
253
	$template->param('use_heading_flags_p' => 1);
176
	$template->param('use_heading_flags_p' => 1);
254
	$template->param('heading_edit_subfields_p' => 1);
177
	$template->param('heading_edit_subfields_p' => 1);
255
	$template->param(action => "Edit subfields",
178
	$template->param(action => "Edit subfields",
256
							tagfield => $tagfield,
179
							tagfield => $tagfield,
257
							tagfieldinput => "<input type=\"hidden\" name=\"tagfield\" value=\"$tagfield\" />",
180
							tagfieldinput => "<input type=\"hidden\" name=\"tagfield\" value=\"$tagfield\" />",
258
							loop => \@loop_data,
181
							loop => \@loop_data,
259
							more_subfields => $more_subfields,
260
							more_tag => $tagfield);
182
							more_tag => $tagfield);
261
183
262
												# END $OP eq ADD_FORM
184
												# END $OP eq ADD_FORM
Lines 276-284 if ($op eq 'add_form') { Link Here
276
	my @kohafield		= ''.$input->param('kohafield');
198
	my @kohafield		= ''.$input->param('kohafield');
277
	my @tab				= $input->param('tab');
199
	my @tab				= $input->param('tab');
278
	my @seealso		= $input->param('seealso');
200
	my @seealso		= $input->param('seealso');
279
	my @ohidden		= $input->param('ohidden');
201
    my @ohidden             = $input->param('ohidden');
280
	#my @ihidden		= $input->param('ihidden');
281
	#my @ehidden		= $input->param('ehidden');
282
	my @authorised_values	= $input->param('authorised_value');
202
	my @authorised_values	= $input->param('authorised_value');
283
	my $authtypecode	= $input->param('authtypecode');
203
	my $authtypecode	= $input->param('authtypecode');
284
	my @frameworkcodes	= $input->param('frameworkcode');
204
	my @frameworkcodes	= $input->param('frameworkcode');
Lines 299-309 if ($op eq 'add_form') { Link Here
299
		my $frameworkcode		=$frameworkcodes[$i];
219
		my $frameworkcode		=$frameworkcodes[$i];
300
		my $value_builder=$value_builder[$i];
220
		my $value_builder=$value_builder[$i];
301
        my $defaultvalue = $defaultvalue[$i];
221
        my $defaultvalue = $defaultvalue[$i];
302
		#my $hidden = $ohidden[$i].$ihidden[$i].$ehidden[$i]; #collate from 3 hiddens;
303
		my $hidden = $ohidden[$i]; #collate from 3 hiddens;
222
		my $hidden = $ohidden[$i]; #collate from 3 hiddens;
304
		my $isurl = $input->param("isurl$i")?1:0;
223
		my $isurl = $input->param("isurl$i")?1:0;
305
		if ($liblibrarian) {
224
		if ($liblibrarian) {
306
			unless (C4::Context->config('demo') eq 1) {
225
			unless (C4::Context->config('demo') or C4::Context->config('demo') eq 1) {
307
				if (auth_subfield_structure_exists($authtypecode, $tagfield, $tagsubfield)) {
226
				if (auth_subfield_structure_exists($authtypecode, $tagfield, $tagsubfield)) {
308
					$sth_update->execute(
227
					$sth_update->execute(
309
						$authtypecode,
228
						$authtypecode,
Lines 372-378 if ($op eq 'add_form') { Link Here
372
################## DELETE_CONFIRMED ##################################
291
################## DELETE_CONFIRMED ##################################
373
# called by delete_confirm, used to effectively confirm deletion of data in DB
292
# called by delete_confirm, used to effectively confirm deletion of data in DB
374
} elsif ($op eq 'delete_confirmed') {
293
} elsif ($op eq 'delete_confirmed') {
375
	unless (C4::Context->config('demo') eq 1) {
294
	unless (C4::Context->config('demo') or C4::Context->config('demo') eq 1) {
376
		my $sth=$dbh->prepare("delete from auth_subfield_structure where tagfield=? and tagsubfield=? and authtypecode=?");
295
		my $sth=$dbh->prepare("delete from auth_subfield_structure where tagfield=? and tagsubfield=? and authtypecode=?");
377
		$sth->execute($tagfield,$tagsubfield,$authtypecode);
296
		$sth->execute($tagfield,$tagsubfield,$authtypecode);
378
	}
297
	}
(-)a/admin/marc_subfields_structure.pl (-133 / +50 lines)
Lines 17-24 Link Here
17
# You should have received a copy of the GNU General Public License
17
# You should have received a copy of the GNU General Public License
18
# along with Koha; if not, see <http://www.gnu.org/licenses>.
18
# along with Koha; if not, see <http://www.gnu.org/licenses>.
19
19
20
use strict;
20
use Modern::Perl;
21
#use warnings; FIXME - Bug 2505
22
use C4::Output;
21
use C4::Output;
23
use C4::Auth;
22
use C4::Auth;
24
use CGI qw ( -utf8 );
23
use CGI qw ( -utf8 );
Lines 65-71 my $tagfield = $input->param('tagfield'); Link Here
65
my $tagsubfield   = $input->param('tagsubfield');
64
my $tagsubfield   = $input->param('tagsubfield');
66
my $frameworkcode = $input->param('frameworkcode');
65
my $frameworkcode = $input->param('frameworkcode');
67
my $pkfield       = "tagfield";
66
my $pkfield       = "tagfield";
68
my $offset        = $input->param('offset');
67
my $offset        = $input->param('offset') || 0;
69
my $script_name   = "/cgi-bin/koha/admin/marc_subfields_structure.pl";
68
my $script_name   = "/cgi-bin/koha/admin/marc_subfields_structure.pl";
70
69
71
my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
70
my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
Lines 80-86 my ( $template, $borrowernumber, $cookie ) = get_template_and_user( Link Here
80
);
79
);
81
my $cache = Koha::Cache->get_instance();
80
my $cache = Koha::Cache->get_instance();
82
81
83
my $op       = $input->param('op');
82
my $op       = $input->param('op') || "";
84
$tagfield =~ s/\,//g;
83
$tagfield =~ s/\,//g;
85
84
86
if ($op) {
85
if ($op) {
Lines 103-111 else { Link Here
103
################## ADD_FORM ##################################
102
################## ADD_FORM ##################################
104
# called by default. Used to create form to add or  modify a record
103
# called by default. Used to create form to add or  modify a record
105
if ( $op eq 'add_form' ) {
104
if ( $op eq 'add_form' ) {
106
    my $data;
107
    my $dbh            = C4::Context->dbh;
105
    my $dbh            = C4::Context->dbh;
108
    my $more_subfields = $input->param("more_subfields") + 1;
109
106
110
    # builds kohafield tables
107
    # builds kohafield tables
111
    my @kohafields;
108
    my @kohafields;
Lines 173-307 if ( $op eq 'add_form' ) { Link Here
173
    $sth->execute( $tagfield, $frameworkcode );
170
    $sth->execute( $tagfield, $frameworkcode );
174
    my @loop_data = ();
171
    my @loop_data = ();
175
    my $i         = 0;
172
    my $i         = 0;
176
    while ( $data = $sth->fetchrow_hashref ) {
173
    while ( my $data = $sth->fetchrow_hashref ) {
177
        my %row_data;    # get a fresh hash for the row data
174
        my %row_data;    # get a fresh hash for the row data
178
        $row_data{defaultvalue} = $data->{defaultvalue};
175
        $row_data{defaultvalue}      = $data->{defaultvalue};
179
        $row_data{maxlength} = $data->{maxlength};
176
        $row_data{maxlength}         = $data->{maxlength};
180
        $row_data{tab} = {
177
        $row_data{tab}               = $data->{tab};
181
                    id      => "tab$i",
178
        $row_data{tagsubfield}       = $data->{tagsubfield};
182
                    default => $data->{'tab'},
179
        $row_data{subfieldcode}      = $data->{'tagsubfield'} eq '@' ? '_' : $data->{'tagsubfield'};
183
                    };
180
        $row_data{urisubfieldcode}   = $row_data{subfieldcode} eq '%' ? 'pct' : $row_data{subfieldcode};
184
181
        $row_data{liblibrarian}      = $data->{'liblibrarian'};
185
        $row_data{tagsubfield} =
182
        $row_data{libopac}           = $data->{'libopac'};
186
            $data->{'tagsubfield'}
183
        $row_data{seealso}           = $data->{'seealso'};
187
          . "<input type=\"hidden\" name=\"tagsubfield\" value=\""
184
        $row_data{kohafields}        = \@kohafields;
188
          . $data->{'tagsubfield'}
185
        $row_data{kohafield}         = $data->{kohafield};
189
          . "\" id=\"tagsubfield\" />";
186
        $row_data{authorised_values} = \@authorised_values;
190
        $row_data{subfieldcode} = $data->{'tagsubfield'} eq '@'?'_':$data->{'tagsubfield'};
187
        $row_data{authorised_value}  = $data->{authorised_value};
191
        $row_data{urisubfieldcode} = $row_data{subfieldcode} eq '%' ? 'pct' : $row_data{subfieldcode};
188
        $row_data{value_builders}    = \@value_builder;
192
        $row_data{liblibrarian} = CGI::escapeHTML( $data->{'liblibrarian'} );
189
        $row_data{value_builder}     = $data->{'value_builder'};
193
        $row_data{libopac}      = CGI::escapeHTML( $data->{'libopac'} );
190
        $row_data{authtypes}         = \@authtypes;
194
        $row_data{seealso}      = CGI::escapeHTML( $data->{'seealso'} );
191
        $row_data{authtypecode}      = $data->{'authtypecode'};
195
        $row_data{kohafield} = {
192
        $row_data{repeatable}        = $data->{repeatable};
196
                    id      => "kohafield$i",
193
        $row_data{mandatory}         = $data->{mandatory};
197
                    values  => \@kohafields,
194
        $row_data{hidden}            = $data->{hidden};
198
                    default => "$data->{'kohafield'}",
195
        $row_data{isurl}             = $data->{isurl};
199
                    };
196
        $row_data{row}               = $i;
200
        $row_data{authorised_value} = {
197
        $row_data{link}              = $data->{'link'};
201
                    id      => "authorised_value$i",
202
                    values  => \@authorised_values,
203
                    default => $data->{'authorised_value'},
204
        };
205
        $row_data{value_builder} = {
206
                    id      => "value_builder$i",
207
                    values  => \@value_builder,
208
                    default => $data->{'value_builder'},
209
        };
210
        $row_data{authtypes} = {
211
                    id      => "authtypecode$i",
212
                    values  => \@authtypes,
213
                    default => $data->{'authtypecode'},
214
        };
215
        $row_data{repeatable} = CGI::checkbox(
216
            -name     => "repeatable$i",
217
            -checked  => $data->{'repeatable'} ? 'checked' : '',
218
            -value    => 1,
219
            -label    => '',
220
            -id       => "repeatable$i"
221
        );
222
        $row_data{mandatory} = CGI::checkbox(
223
            -name     => "mandatory$i",
224
            -checked  => $data->{'mandatory'} ? 'checked' : '',
225
            -value    => 1,
226
            -label    => '',
227
            -id       => "mandatory$i"
228
        );
229
        $row_data{hidden} = CGI::escapeHTML( $data->{hidden} );
230
        $row_data{isurl}  = CGI::checkbox(
231
            -name     => "isurl$i",
232
            -id       => "isurl$i",
233
            -checked  => $data->{'isurl'} ? 'checked' : '',
234
            -value    => 1,
235
            -label    => ''
236
        );
237
        $row_data{row}    = $i;
238
        $row_data{link}   = CGI::escapeHTML( $data->{'link'} ); 
239
        push( @loop_data, \%row_data );
198
        push( @loop_data, \%row_data );
240
        $i++;
199
        $i++;
241
    }
200
    }
242
201
243
    # add more_subfields empty lines for add if needed
202
    # Add a new row for the "New" tab
244
        my %row_data;    # get a fresh hash for the row data
203
    my %row_data;    # get a fresh hash for the row data
245
        $row_data{'new_subfield'} = 1;
204
    $row_data{'new_subfield'}    = 1;
246
        $row_data{'subfieldcode'} = '';
205
    $row_data{'subfieldcode'}    = '';
247
        $row_data{'maxlength'} = 9999;
206
    $row_data{'maxlength'}       = 9999;
248
207
    $row_data{tab}               = -1;                    #ignore
249
        $row_data{tab} = {
208
    $row_data{tagsubfield}       = "";
250
                    id      => "tab$i",
209
    $row_data{liblibrarian}      = "";
251
                    default => $data->{'tab'},
210
    $row_data{libopac}           = "";
252
                    };
211
    $row_data{seealso}           = "";
253
        $row_data{tagsubfield} =
212
    $row_data{hidden}            = "";
254
            "<input type=\"text\" name=\"tagsubfield\" value=\""
213
    $row_data{repeatable}        = 0;
255
          . $data->{'tagsubfield'}
214
    $row_data{mandatory}         = 0;
256
          . "\" size=\"1\" id=\"tagsubfield\" maxlength=\"1\" />";
215
    $row_data{isurl}             = 0;
257
        $row_data{liblibrarian} = "";
216
    $row_data{kohafields}        = \@kohafields;
258
        $row_data{libopac}      = "";
217
    $row_data{authorised_values} = \@authorised_values;
259
        $row_data{seealso}      = "";
218
    $row_data{value_builders}    = \@value_builder;
260
        $row_data{kohafield} = {
219
    $row_data{authtypes}         = \@authtypes;
261
                    id      => "kohafield$i",
220
    $row_data{link}              = "";
262
                    values  => \@kohafields,
221
    $row_data{row}               = $i;
263
                    default => "$data->{'kohafield'}",
222
    push( @loop_data, \%row_data );
264
                    };
265
        $row_data{hidden}     = "";
266
        $row_data{repeatable} = CGI::checkbox(
267
            -name     => "repeatable$i",
268
            -id       => "repeatable$i",
269
            -checked  => '',
270
            -value    => 1,
271
            -label    => ''
272
        );
273
        $row_data{mandatory} = CGI::checkbox(
274
            -name     => "mandatory$i",
275
            -id       => "mandatory$i",
276
            -checked  => '',
277
            -value    => 1,
278
            -label    => ''
279
        );
280
        $row_data{isurl} = CGI::checkbox(
281
            -name     => "isurl$i",
282
            -id       => "isurl$i",
283
            -checked  => '',
284
            -value    => 1,
285
            -label    => ''
286
        );
287
        $row_data{value_builder} = {
288
                    id      => "value_builder$i",
289
                    values  => \@value_builder,
290
                    default => $data->{'value_builder'},
291
        };
292
        $row_data{authorised_value} = {
293
                    id      => "authorised_value$i",
294
                    values  => \@authorised_values,
295
                    default => $data->{'authorised_value'},
296
        };
297
        $row_data{authtypes} = {
298
                    id      => "authtypecode$i",
299
                    values  => \@authtypes,
300
                    default => $data->{'authtypecode'},
301
        };
302
        $row_data{link}   = CGI::escapeHTML( $data->{'link'} );
303
        $row_data{row}    = $i;
304
        push( @loop_data, \%row_data );
305
223
306
    $template->param( 'use_heading_flags_p'      => 1 );
224
    $template->param( 'use_heading_flags_p'      => 1 );
307
    $template->param( 'heading_edit_subfields_p' => 1 );
225
    $template->param( 'heading_edit_subfields_p' => 1 );
Lines 309-315 if ( $op eq 'add_form' ) { Link Here
309
        action   => "Edit subfields",
227
        action   => "Edit subfields",
310
        tagfield => $tagfield,
228
        tagfield => $tagfield,
311
        loop           => \@loop_data,
229
        loop           => \@loop_data,
312
        more_subfields => $more_subfields,
313
        more_tag       => $tagfield
230
        more_tag       => $tagfield
314
    );
231
    );
315
232
Lines 368-374 elsif ( $op eq 'add_validate' ) { Link Here
368
        my $maxlength = $maxlength[$i] ? $maxlength[$i] : 9999;
285
        my $maxlength = $maxlength[$i] ? $maxlength[$i] : 9999;
369
        
286
        
370
        if (defined($liblibrarian) && $liblibrarian ne "") {
287
        if (defined($liblibrarian) && $liblibrarian ne "") {
371
            unless ( C4::Context->config('demo') eq 1 ) {
288
            unless ( C4::Context->config('demo') or C4::Context->config('demo') eq 1 ) {
372
                if (marc_subfield_structure_exists($tagfield, $tagsubfield, $frameworkcode)) {
289
                if (marc_subfield_structure_exists($tagfield, $tagsubfield, $frameworkcode)) {
373
                    $sth_update->execute(
290
                    $sth_update->execute(
374
                        $tagfield,
291
                        $tagfield,
Lines 457-463 elsif ( $op eq 'delete_confirm' ) { Link Here
457
}
374
}
458
elsif ( $op eq 'delete_confirmed' ) {
375
elsif ( $op eq 'delete_confirmed' ) {
459
    my $dbh = C4::Context->dbh;
376
    my $dbh = C4::Context->dbh;
460
    unless ( C4::Context->config('demo') eq 1 ) {
377
    unless ( C4::Context->config('demo') or C4::Context->config('demo') eq 1 ) {
461
        my $sth =
378
        my $sth =
462
          $dbh->prepare(
379
          $dbh->prepare(
463
"delete from marc_subfield_structure where tagfield=? and tagsubfield=? and frameworkcode=?"
380
"delete from marc_subfield_structure where tagfield=? and tagsubfield=? and frameworkcode=?"
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt (-38 / +62 lines)
Lines 49-57 Link Here
49
            <ul>
49
            <ul>
50
                [% FOREACH loo IN loop %]
50
                [% FOREACH loo IN loop %]
51
                    [% IF ( loo.new_subfield ) %]
51
                    [% IF ( loo.new_subfield ) %]
52
                        <li><a href="#sub[% loo.tagsubfield %]field" title="[% loo.liblibrarian %]">New</a></li>
52
                        <li><a href="#sub[% loo.tagsubfield %]field" title="[% loo.liblibrarian | html_entity %]">New</a></li>
53
                    [% ELSE %]
53
                    [% ELSE %]
54
                        <li><a href="#sub[% loo.tagsubfield %]field" title="[% loo.liblibrarian %]">
54
                        <li><a href="#sub[% loo.tagsubfield %]field" title="[% loo.liblibrarian | html_entity %]">
55
                            [% loo.tagsubfield %]
55
                            [% loo.tagsubfield %]
56
                    </a></li>
56
                    </a></li>
57
                    [% END %]
57
                    [% END %]
Lines 62-89 Link Here
62
        <div id="sub[% loo.tagsubfield %]field">
62
        <div id="sub[% loo.tagsubfield %]field">
63
            <fieldset class="rows"><ol>
63
            <fieldset class="rows"><ol>
64
64
65
                    [% IF ( loo.new_subfield ) %]
65
                [% IF ( loo.new_subfield ) %]
66
                <li><label for="tagsubfieldinput[% loo.row %]">Subfield code: </label>[% loo.tagsubfieldinput %]&nbsp;</li>
66
                    <li>
67
                        <label for="tagsubfieldinput[% loo.row %]">Subfield code: </label>
68
                        <input type="text" name="tagsubfield" value="[% loo.tagsubfield %]" size="1" id="tagsubfield" maxlength="1" />
69
                    </li>
70
                [% ELSE %]
71
                    <li>
72
                        <input type="hidden" name="tagsubfield" value="[% loo.tagsubfield %]" />
73
                    </li>
74
                [% END %]
75
                <li>
76
                    <label for="repeatable[% loo.row %]">Repeatable: </label>
77
                    [% IF loo.repeatable %]
78
                        <input type="checkbox" id="repeatable[% loo.row %]" name="repeatable[% loo.row %]" checked="checked" value="1" />
67
                    [% ELSE %]
79
                    [% ELSE %]
80
                        <input type="checkbox" id="repeatable[% loo.row %]" name="repeatable[% loo.row %]" value="1" />
81
                    [% END %]
82
                </li>
68
                <li>
83
                <li>
69
                <input type="hidden" name="tagsubfield" value="[% loo.tagsubfield %]" />
84
                    <label for="mandatory[% loo.row %]">Mandatory: </label>
70
                 </li>
85
                    [% IF loo.mandatory %]
86
                        <input type="checkbox" id="mandatory[% loo.row %]" name="mandatory[% loo.row %]" checked="checked" value="1" />
87
                    [% ELSE %]
88
                        <input type="checkbox" id="mandatory[% loo.row %]" name="mandatory[% loo.row %]" value="1" />
71
                    [% END %]
89
                    [% END %]
72
                <li><label for="repeatable[% loo.row %]">Repeatable: </label>[% loo.repeatable %]&nbsp;</li>
90
                </li>
73
                <li><label for="mandatory[% loo.row %]">Mandatory: </label>[% loo.mandatory %]&nbsp;</li>
91
                <li><label for="liblibrarian[% loo.row %]">Text for librarian: </label><input id="liblibrarian[% loo.row %]" type="text" name="liblibrarian" value="[% loo.liblibrarian | html_entity %]" size="40" maxlength="80" /></li>
74
                <li><label for="liblibrarian[% loo.row %]">Text for librarian: </label><input id="liblibrarian[% loo.row %]" type="text" name="liblibrarian" value="[% loo.liblibrarian %]" size="40" maxlength="80" /></li>
92
                <li><label for="libopac[% loo.row %]">Text for OPAC: </label><input type="text" id="libopac[% loo.row %]" name="libopac" value="[% loo.libopac | html_entity %]" size="40" maxlength="80" /></li>
75
                <li><label for="libopac[% loo.row %]">Text for OPAC: </label><input type="text" id="libopac[% loo.row %]" name="libopac" value="[% loo.libopac %]" size="40" maxlength="80" /></li>
76
                <li><label for="tab[% loo.row %]">Managed in tab: </label>
93
                <li><label for="tab[% loo.row %]">Managed in tab: </label>
77
                    <select name="tab" size="1" id="[% loo.tab.id %]">
94
                    <select name="tab" size="1" id="tab[% loo.row %]">
78
                        [%- IF ( loo.tab.default ==  -1 ) -%]
95
                        [%- IF ( loo.tab ==  -1 ) -%]
79
                        <option value="-1" selected="selected">ignore</option>
96
                        <option value="-1" selected="selected">ignore</option>
80
                        [%- ELSE -%]
97
                        [%- ELSE -%]
81
                        <option value="-1">ignore</option>
98
                        <option value="-1">ignore</option>
82
                        [%- END -%]
99
                        [%- END -%]
83
                    [%- FOREACH t IN [ '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10'] -%]
100
                    [%- FOREACH t IN [ '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10'] -%]
84
                        [%- IF ( loo.tab.default ==  t && t.length>0 ) -%]
101
                        [%- IF ( loo.tab ==  t && t.length>0 ) -%]
85
                        <option value="[%- t -%]" selected="selected">[%- t -%]</option>
102
                        <option value="[%- t -%]" selected="selected">[%- t -%]</option>
86
                        [%- ELSIF ( loo.tab.default ==  t ) -%]
103
                        [%- ELSIF ( loo.tab ==  t ) -%]
87
                        <option value="[%- t -%]" selected="selected">&nbsp;</option>
104
                        <option value="[%- t -%]" selected="selected">&nbsp;</option>
88
                        [%- ELSE -%]
105
                        [%- ELSE -%]
89
                        <option value="[%- t -%]">[%- t -%]</option>
106
                        <option value="[%- t -%]">[%- t -%]</option>
Lines 97-107 Link Here
97
                        <legend>Display</legend>
114
                        <legend>Display</legend>
98
                        <ol>
115
                        <ol>
99
                            <li><label for="ohidden[% loo.row %]">Select to display or not:</label>
116
                            <li><label for="ohidden[% loo.row %]">Select to display or not:</label>
100
                                <select name="ohidden" size="1" id="[% loo.ohidden.id %]">
117
                                <select name="ohidden" size="1" id="ohidden[% loo.row %]">
101
                                    [%- IF ( loo.ohidden.default ==  0 ) -%]
118
                                    [%- IF ( loo.ohidden ==  0 ) -%]
102
                                    <option value= "0" selected="selected">Show all</option>
119
                                    <option value= "0" selected="selected">Show all</option>
103
                                    <option value="-5">Hide all</option>
120
                                    <option value="-5">Hide all</option>
104
                                    [%- ELSIF ( loo.ohidden.default == -5 ) -%]
121
                                    [%- ELSIF ( loo.ohidden == -5 ) -%]
105
                                    <option value= "0">Show all</option>
122
                                    <option value= "0">Show all</option>
106
                                    <option value="-5" selected="selected">Hide all</option>
123
                                    <option value="-5" selected="selected">Hide all</option>
107
                                    [%- ELSE -%]
124
                                    [%- ELSE -%]
Lines 117-123 Link Here
117
                    <fieldset class="rows">
134
                    <fieldset class="rows">
118
                        <legend>Advanced constraints:</legend>
135
                        <legend>Advanced constraints:</legend>
119
                        <ol>
136
                        <ol>
120
                            <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>
137
                            <li>
138
                                <label for="isurl[% loo.row %]">Is a URL:</label>
139
                                [% IF loo.isurl %]
140
                                    <input type="checkbox" id="isurl[% loo.row %]" name="isurl[% loo.row %]" checked="checked" value="1" />
141
                                [% ELSE %]
142
                                    <input type="checkbox" id="isurl[% loo.row %]" name="isurl[% loo.row %]" value="1" />
143
                                [% END %]
144
                                (if checked, it means that the subfield is a URL and can be clicked)
145
                            </li>
121
                            <li>
146
                            <li>
122
                                <label for="defaultvalue[% loo.row %]">Default value:</label>
147
                                <label for="defaultvalue[% loo.row %]">Default value:</label>
123
                                <input type="text" name="defaultvalue" id="defaultvalue[% loo.row %]" value="[% loo.defaultvalue %]" />
148
                                <input type="text" name="defaultvalue" id="defaultvalue[% loo.row %]" value="[% loo.defaultvalue %]" />
Lines 130-140 Link Here
130
                        <ol>
155
                        <ol>
131
                            <li>
156
                            <li>
132
                                <label for="kohafield[% loo.row %]">Koha field:</label>
157
                                <label for="kohafield[% loo.row %]">Koha field:</label>
133
                                <select name="kohafield" id="[% loo.kohafield.id %]" size="1">
158
                                <select name="kohafield" id="kohafield[% loo.row %]" size="1">
134
                                [%- FOREACH value IN loo.kohafield.values %]
159
                                [%- FOREACH value IN loo.kohafields %]
135
                                    [% IF ( value == loo.kohafield.default  && value.length>0 ) -%]
160
                                    [% IF ( value == loo.kohafield  && value.length>0 ) -%]
136
                                    <option value="[% value %]" selected="selected">[% value %]</option>
161
                                    <option value="[% value %]" selected="selected">[% value %]</option>
137
                                    [%- ELSIF ( value == loo.kohafield.default ) -%]
162
                                    [%- ELSIF ( value == loo.kohafield ) -%]
138
                                    <option value="[% value %]" selected="selected">&nbsp;</option>
163
                                    <option value="[% value %]" selected="selected">&nbsp;</option>
139
                                    [%- ELSIF ( value.length==0 ) -%]
164
                                    [%- ELSIF ( value.length==0 ) -%]
140
                                    <option value="[% value %]">&nbsp;</option>
165
                                    <option value="[% value %]">&nbsp;</option>
Lines 146-156 Link Here
146
                            </li>
171
                            </li>
147
                            <li>
172
                            <li>
148
                                <label for="authorised_value[% loo.row %]">Authorized value:</label>
173
                                <label for="authorised_value[% loo.row %]">Authorized value:</label>
149
                                <select name="authorised_value" id="[% loo.authorised_value.id %]" size="1">
174
                                <select name="authorised_value" id="authorised_value[% loo.row %]" size="1">
150
                                [%- FOREACH value IN loo.authorised_value.values %]
175
                                [%- FOREACH value IN loo.authorised_values %]
151
                                    [% IF ( value == loo.authorised_value.default && value.length>0 ) -%]
176
                                    [% IF ( value == loo.authorised_value && value.length>0 ) -%]
152
                                    <option value="[% value %]" selected="selected">[% value %]</option>
177
                                    <option value="[% value %]" selected="selected">[% value %]</option>
153
                                    [%- ELSIF ( value == loo.authorised_value.default ) -%]
178
                                    [%- ELSIF ( value == loo.authorised_value ) -%]
154
                                    <option value="[% value %]" selected>&nbsp;</option>
179
                                    <option value="[% value %]" selected>&nbsp;</option>
155
                                    [%- ELSIF ( value.length==0 ) -%]
180
                                    [%- ELSIF ( value.length==0 ) -%]
156
                                    <option value="[% value %]">&nbsp;</option>
181
                                    <option value="[% value %]">&nbsp;</option>
Lines 162-172 Link Here
162
                            </li>
187
                            </li>
163
                            <li>
188
                            <li>
164
                                <label for="frameworkcode[% loo.row %]">Thesaurus:</label>
189
                                <label for="frameworkcode[% loo.row %]">Thesaurus:</label>
165
                                <select name="frameworkcode" id="[% loo.frameworkcode.id %]" size="1">
190
                                <select name="frameworkcode" id="frameworkcode[% loo.row %]" size="1">
166
                                [%- FOREACH value IN loo.frameworkcode.values %]
191
                                [%- FOREACH value IN loo.frameworkcodes %]
167
                                    [% IF ( value == loo.frameworkcode.default && value.length>0 ) -%]
192
                                    [% IF ( value == loo.frameworkcode && value.length>0 ) -%]
168
                                    <option value="[% value %]" selected="selected">[% value %]</option>
193
                                    <option value="[% value %]" selected="selected">[% value %]</option>
169
                                    [%- ELSIF ( value == loo.frameworkcode.default ) -%]
194
                                    [%- ELSIF ( value == loo.frameworkcode ) -%]
170
                                    <option value="[% value %]" selected="selected">&nbsp;</option>
195
                                    <option value="[% value %]" selected="selected">&nbsp;</option>
171
                                    [%- ELSIF ( value.length==0 ) -%]
196
                                    [%- ELSIF ( value.length==0 ) -%]
172
                                    <option value="[% value %]">&nbsp;</option>
197
                                    <option value="[% value %]">&nbsp;</option>
Lines 178-188 Link Here
178
                            </li>
203
                            </li>
179
                            <li>
204
                            <li>
180
                                <label for="value_builder[% loo.row %]">Plugin:</label>
205
                                <label for="value_builder[% loo.row %]">Plugin:</label>
181
                                <select name="value_builder" id="[% loo.value_builder.id %]" size="1">
206
                                <select name="value_builder" id="value_builder[% loo.row %]" size="1">
182
                                [%- FOREACH value IN loo.value_builder.values %]
207
                                [%- FOREACH value IN loo.value_builders %]
183
                                    [% IF ( value == loo.value_builder.default && value.length>0 ) -%]
208
                                    [% IF ( value == loo.value_builder && value.length>0 ) -%]
184
                                    <option value="[% value %]" selected="selected">[% value %]</option>
209
                                    <option value="[% value %]" selected="selected">[% value %]</option>
185
                                    [%- ELSIF ( value == loo.value_builder.default ) -%]
210
                                    [%- ELSIF ( value == loo.value_builder ) -%]
186
                                    <option value="[% value %]" selected="selected">&nbsp;</option>
211
                                    <option value="[% value %]" selected="selected">&nbsp;</option>
187
                                    [%- ELSIF ( value.length==0 ) -%]
212
                                    [%- ELSIF ( value.length==0 ) -%]
188
                                    <option value="[% value %]">&nbsp;</option>
213
                                    <option value="[% value %]">&nbsp;</option>
Lines 210-216 Link Here
210
            <input type="hidden" name="op" value="delete_confirmed" />
235
            <input type="hidden" name="op" value="delete_confirmed" />
211
            <table>
236
            <table>
212
                <tr><th scope="row">Subfield:</th> <td>[% tagsubfield %]</td></tr>
237
                <tr><th scope="row">Subfield:</th> <td>[% tagsubfield %]</td></tr>
213
                <tr><th scope="row">Description:</th> <td>[% liblibrarian %]</td></tr>
238
                <tr><th scope="row">Description:</th> <td>[% liblibrarian | html_entity %]</td></tr>
214
            </table>
239
            </table>
215
            <input type="hidden" name="searchfield" value="[% searchfield %]" />
240
            <input type="hidden" name="searchfield" value="[% searchfield %]" />
216
            <input type="hidden" name="tagfield" value="[% tagfield%]" />
241
            <input type="hidden" name="tagfield" value="[% tagfield%]" />
Lines 219-225 Link Here
219
            <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete this subfield</button>
244
            <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete this subfield</button>
220
        </form>
245
        </form>
221
246
222
223
        <form action="[% delete_link %]" method="get">
247
        <form action="[% delete_link %]" method="get">
224
            <input type="hidden" name="searchfield" value="[% searchfield %]" />
248
            <input type="hidden" name="searchfield" value="[% searchfield %]" />
225
            <input type="hidden" name="tagfield" value="[% tagfield | html %]" />
249
            <input type="hidden" name="tagfield" value="[% tagfield | html %]" />
Lines 257-265 Link Here
257
        <td>[% loo.tagsubfield %]</td>
281
        <td>[% loo.tagsubfield %]</td>
258
        <td>
282
        <td>
259
            [% IF ( loo.subfield_ignored ) %]
283
            [% IF ( loo.subfield_ignored ) %]
260
                    <i>[% loo.liblibrarian %]</i>
284
                    <i>[% loo.liblibrarian | html_entity %]</i>
261
            [% ELSE %]
285
            [% ELSE %]
262
                    [% loo.liblibrarian %]
286
                    [% loo.liblibrarian | html_entity %]
263
            [% END %]
287
            [% END %]
264
        </td>
288
        </td>
265
        <td>
289
        <td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt (-27 / +48 lines)
Lines 46-54 Link Here
46
   <ul>
46
   <ul>
47
        [% FOREACH loo IN loop %]
47
        [% FOREACH loo IN loop %]
48
            [% IF ( loo.new_subfield ) %]
48
            [% IF ( loo.new_subfield ) %]
49
                <li><a href="#sub[% loo.urisubfieldcode %]field" title="[% loo.liblibrarian %]">New</a></li>
49
                <li><a href="#sub[% loo.urisubfieldcode %]field" title="[% loo.liblibrarian | html_entity %]">New</a></li>
50
            [% ELSE %]
50
            [% ELSE %]
51
                <li><a href="#sub[% loo.urisubfieldcode %]field" title="[% loo.liblibrarian %]">
51
                <li><a href="#sub[% loo.urisubfieldcode %]field" title="[% loo.liblibrarian | html_entity %]">
52
                    [% loo.subfieldcode %]
52
                    [% loo.subfieldcode %]
53
               </a></li>
53
               </a></li>
54
            [% END %]
54
            [% END %]
Lines 67-91 Link Here
67
                		[% ELSE %]
67
                		[% ELSE %]
68
                		<li><label for="tagsubfield[% loo.row %]">Subfield code:</label> <input type="text" id="tagsubfield[% loo.row %]" name="tagsubfield" value="[% loo.subfieldcode %]" /></li>
68
                		<li><label for="tagsubfield[% loo.row %]">Subfield code:</label> <input type="text" id="tagsubfield[% loo.row %]" name="tagsubfield" value="[% loo.subfieldcode %]" /></li>
69
                		[% END %]
69
                		[% END %]
70
                		<li><label for="liblibrarian[% loo.row %]">Text for librarian: </label><input id="liblibrarian[% loo.row %]" type="text" name="liblibrarian" value="[% loo.liblibrarian %]" size="40" maxlength="80" /></li>
70
                        <li><label for="liblibrarian[% loo.row %]">Text for librarian: </label><input id="liblibrarian[% loo.row %]" type="text" name="liblibrarian" value="[% loo.liblibrarian | html_entity %]" size="40" maxlength="80" /></li>
71
                		<li><label for="libopac[% loo.row %]">Text for OPAC: </label><input type="text" id="libopac[% loo.row %]" name="libopac" value="[% loo.libopac %]" size="40" maxlength="80" /></li>
71
                        <li><label for="libopac[% loo.row %]">Text for OPAC: </label><input type="text" id="libopac[% loo.row %]" name="libopac" value="[% loo.libopac | html_entity %]" size="40" maxlength="80" /></li>
72
                		<li><label for="repeatable[% loo.row %]">Repeatable: </label>[% loo.repeatable %]</li>
72
                        <li>
73
                		<li><label for="mandatory[% loo.row %]">Mandatory: </label>[% loo.mandatory %]</li>
73
                            <label for="repeatable[% loo.row %]">Repeatable: </label>
74
                            [% IF loo.repeatable %]
75
                                <input type="checkbox" id="repeatable[% loo.row %]" name="repeatable[% loo.row %]" checked="checked" value="1" />
76
                            [% ELSE %]
77
                                <input type="checkbox" id="repeatable[% loo.row %]" name="repeatable[% loo.row %]" value="1" />
78
                            [% END %]
79
                        </li>
80
                        <li>
81
                            <label for="mandatory[% loo.row %]">Mandatory: </label>
82
                            [% IF loo.mandatory %]
83
                                <input type="checkbox" id="mandatory[% loo.row %]" name="mandatory[% loo.row %]" checked="checked" value="1" />
84
                            [% ELSE %]
85
                                <input type="checkbox" id="mandatory[% loo.row %]" name="mandatory[% loo.row %]" value="1" />
86
                            [% END %]
87
                        </li>
74
                        <li><label for="tab[% loo.row %]">Managed in tab: </label>
88
                        <li><label for="tab[% loo.row %]">Managed in tab: </label>
75
                            <select name="tab" tabindex="" size="1" id="[% loo.tab.id %]">
89
                            <select name="tab" tabindex="" size="1" id="tab[% loo.row %]">
76
                            [%- IF ( loo.tab.default ==  -1 ) -%]
90
                            [%- IF ( loo.tab ==  -1 ) -%]
77
                                <option value="-1" selected="selected">ignore</option>
91
                                <option value="-1" selected="selected">ignore</option>
78
                            [%- ELSE -%]
92
                            [%- ELSE -%]
79
                                <option value="-1">ignore</option>
93
                                <option value="-1">ignore</option>
80
                            [%- END -%]
94
                            [%- END -%]
81
                            [%- FOREACH t IN [ '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'] -%]
95
                            [%- FOREACH t IN [ '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'] -%]
82
                                [%- IF ( loo.tab.default ==  t ) -%]
96
                                [%- IF ( loo.tab ==  t ) -%]
83
                                <option value="[%- t -%]" selected="selected">[%- t -%]</option>
97
                                <option value="[%- t -%]" selected="selected">[%- t -%]</option>
84
                                [%- ELSE -%]
98
                                [%- ELSE -%]
85
                                <option value="[%- t -%]">[%- t -%]</option>
99
                                <option value="[%- t -%]">[%- t -%]</option>
86
                                [%- END -%]
100
                                [%- END -%]
87
                            [%- END -%]
101
                            [%- END -%]
88
                            [%- IF ( loo.tab.default ==  10 ) -%]
102
                            [%- IF ( loo.tab ==  10 ) -%]
89
                                <option value="10" selected="selected">items (10)</option>
103
                                <option value="10" selected="selected">items (10)</option>
90
                            [%- ELSE -%]
104
                            [%- ELSE -%]
91
                                <option value="10">items (10)</option>
105
                                <option value="10">items (10)</option>
Lines 117-129 Link Here
117
                    <input type="checkbox" id="hidden_flagged_[% loo.row %]" name="flagged_[% loo.row %]"/>
131
                    <input type="checkbox" id="hidden_flagged_[% loo.row %]" name="flagged_[% loo.row %]"/>
118
                    <label for="hidden_flagged_[% loo.row %]" style="float: none;">Flagged</label>
132
                    <label for="hidden_flagged_[% loo.row %]" style="float: none;">Flagged</label>
119
                </li>
133
                </li>
120
                <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>
134
                <li>
135
                    <label for="isurl[% loo.row %]">Is a URL:</label>
136
                    [% IF loo.isurl %]
137
                        <input type="checkbox" id="isurl[% loo.row %]" name="isurl[% loo.row %]" checked="checked" value="1" />
138
                    [% ELSE %]
139
                        <input type="checkbox" id="isurl[% loo.row %]" name="isurl[% loo.row %]" value="1" />
140
                    [% END %]
141
                    (if checked, it means that the subfield is a URL and can be clicked)
142
                </li>
121
                <li><label for="link[% loo.row %]">Link:</label><input type="text" id="link[% loo.row %]" name="link" value="[% loo.link %]" size="10" maxlength="80" /> (e.g., Title or Local-Number) <span class="error"><em>NOTE: If you change this value you must ask your administrator to run misc/batchRebuildBiblioTables.pl.</em></span></li>
143
                <li><label for="link[% loo.row %]">Link:</label><input type="text" id="link[% loo.row %]" name="link" value="[% loo.link %]" size="10" maxlength="80" /> (e.g., Title or Local-Number) <span class="error"><em>NOTE: If you change this value you must ask your administrator to run misc/batchRebuildBiblioTables.pl.</em></span></li>
122
                <li>
144
                <li>
123
                    <label for="kohafield[% loo.row %]">Koha link:</label>
145
                    <label for="kohafield[% loo.row %]">Koha link:</label>
124
                    <select name="kohafield" id="[% loo.kohafield.id %]" size="1">
146
                    <select name="kohafield" id="kohafield[% loo.row %]" size="1">
125
                    [% FOREACH value IN loo.kohafield.values %]
147
                    [% FOREACH value IN loo.kohafields %]
126
                      [% IF ( value == loo.kohafield.default ) %]
148
                      [% IF ( value == loo.kohafield ) %]
127
                        <option value="[% value %]" selected="selected">[% value %]</option>
149
                        <option value="[% value %]" selected="selected">[% value %]</option>
128
                      [% ELSE %]
150
                      [% ELSE %]
129
                        <option value="[% value %]">[% value %]</option>
151
                        <option value="[% value %]">[% value %]</option>
Lines 140-148 Link Here
140
                    	<ol>
162
                    	<ol>
141
                            <li>
163
                            <li>
142
                                <label for="authorised_value[% loo.row %]">Authorized value:</label>
164
                                <label for="authorised_value[% loo.row %]">Authorized value:</label>
143
                                <select name="authorised_value" id="[% loo.authorised_value.id %]" size="1">
165
                                <select name="authorised_value" id="authorised_value[% loo.row %]" size="1">
144
                                [% FOREACH value IN loo.authorised_value.values %]
166
                                [% FOREACH value IN loo.authorised_values %]
145
                                    [% IF ( value == loo.authorised_value.default ) %]
167
                                    [% IF ( value == loo.authorised_value ) %]
146
                                    <option value="[% value %]" selected="selected">[% value %]</option>
168
                                    <option value="[% value %]" selected="selected">[% value %]</option>
147
                                    [% ELSE %]
169
                                    [% ELSE %]
148
                                    <option value="[% value %]">[% value %]</option>
170
                                    <option value="[% value %]">[% value %]</option>
Lines 152-160 Link Here
152
                            </li>
174
                            </li>
153
                            <li>
175
                            <li>
154
                                <label for="authtypecode[% loo.row %]">Thesaurus:</label>
176
                                <label for="authtypecode[% loo.row %]">Thesaurus:</label>
155
                                <select name="authtypecode" id="[% loo.authtypes.id %]" size="1">
177
                                <select name="authtypecode" id="authtypecode[% loo.row %]" size="1">
156
                                [% FOREACH value IN loo.authtypes.values %]
178
                                [% FOREACH value IN loo.authtypes %]
157
                                    [% IF ( value == loo.authtypes.default ) %]
179
                                    [% IF ( value == loo.authtypecode ) %]
158
                                    <option value="[% value %]" selected="selected">[% value %]</option>
180
                                    <option value="[% value %]" selected="selected">[% value %]</option>
159
                                    [% ELSE %]
181
                                    [% ELSE %]
160
                                    <option value="[% value %]">[% value %]</option>
182
                                    <option value="[% value %]">[% value %]</option>
Lines 164-172 Link Here
164
                            </li>
186
                            </li>
165
                            <li>
187
                            <li>
166
                                <label for="value_builder[% loo.row %]">Plugin:</label>
188
                                <label for="value_builder[% loo.row %]">Plugin:</label>
167
                                <select name="value_builder" id="[% loo.value_builder.id %]" size="1">
189
                                <select name="value_builder" id="value_builder[% loo.row %]" size="1">
168
                                [% FOREACH value IN loo.value_builder.values %]
190
                                [% FOREACH value IN loo.value_builders %]
169
                                    [% IF ( value == loo.value_builder.default ) %]
191
                                    [% IF ( value == loo.value_builder ) %]
170
                                    <option value="[% value %]" selected="selected">[% value %]</option>
192
                                    <option value="[% value %]" selected="selected">[% value %]</option>
171
                                    [% ELSE %]
193
                                    [% ELSE %]
172
                                    <option value="[% value %]">[% value %]</option>
194
                                    <option value="[% value %]">[% value %]</option>
Lines 191-197 Link Here
191
    <div class="dialog alert">
213
    <div class="dialog alert">
192
        <h3>Confirm deletion of subfield [% tagsubfield %]?</h3>
214
        <h3>Confirm deletion of subfield [% tagsubfield %]?</h3>
193
        <p>Subfield: [% tagsubfield %]</p>
215
        <p>Subfield: [% tagsubfield %]</p>
194
        <p>Description: [% liblibrarian %]</p>
216
        <p>Description: [% liblibrarian | html_entity %]</p>
195
217
196
        <form action="[% delete_link %]" method="post"><input type="hidden" name="op" value="delete_confirmed" />
218
        <form action="[% delete_link %]" method="post"><input type="hidden" name="op" value="delete_confirmed" />
197
            <input type="hidden" name="searchfield" value="[% searchfield %]" />
219
            <input type="hidden" name="searchfield" value="[% searchfield %]" />
Lines 241-249 Link Here
241
    <td><a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?op=add_form&amp;tagfield=[% loo.tagfield %]&amp;frameworkcode=[% frameworkcode %]#sub[% loo.tagsubfield %]field">[% loo.tagsubfield %]</a></td>
263
    <td><a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?op=add_form&amp;tagfield=[% loo.tagfield %]&amp;frameworkcode=[% frameworkcode %]#sub[% loo.tagsubfield %]field">[% loo.tagsubfield %]</a></td>
242
    <td>
264
    <td>
243
        [% IF ( loo.subfield_ignored ) %]
265
        [% IF ( loo.subfield_ignored ) %]
244
            <i>[% loo.liblibrarian %]</i>
266
            <i>[% loo.liblibrarian | html_entity %]</i>
245
        [% ELSE %]
267
        [% ELSE %]
246
            [% loo.liblibrarian %]
268
            [% loo.liblibrarian | html_entity %]
247
        [% END %]
269
        [% END %]
248
    </td>
270
    </td>
249
    <td>
271
    <td>
250
- 

Return to bug 15773