Bugzilla – Attachment 53404 Details for
Bug 9701
Configure default indicators
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 9701: QA follow-up - Fix indentation and some strings
Bug-9701-QA-follow-up---Fix-indentation-and-some-s.patch (text/plain), 12.33 KB, created by
Katrin Fischer
on 2016-07-14 23:54:01 UTC
(
hide
)
Description:
Bug 9701: QA follow-up - Fix indentation and some strings
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2016-07-14 23:54:01 UTC
Size:
12.33 KB
patch
obsolete
>From 16f14b18dd4ff12df5e31b7000078a563742c98c Mon Sep 17 00:00:00 2001 >From: Katrin Fischer <Katrin.Fischer.83@web.de> >Date: Fri, 15 Jul 2016 01:13:30 +0200 >Subject: [PATCH] Bug 9701: QA follow-up - Fix indentation and some strings > >- Fixes tabs pointed out by the QA script. >- Changes table headings Indic1 and Indic2 to Ind. 1 and Ind. 2 >--- > C4/Biblio.pm | 4 +- > admin/marctagstructure.pl | 44 +++++++++++----------- > .../prog/en/modules/admin/marctagstructure.tt | 16 ++++---- > 3 files changed, 32 insertions(+), 32 deletions(-) > >diff --git a/C4/Biblio.pm b/C4/Biblio.pm >index 1f8ac2c..93b8409 100644 >--- a/C4/Biblio.pm >+++ b/C4/Biblio.pm >@@ -1142,8 +1142,8 @@ sub GetMarcStructure { > $res->{$tag}->{tab} = ""; > $res->{$tag}->{mandatory} = $mandatory; > $res->{$tag}->{repeatable} = $repeatable; >- $res->{$tag}->{ind1_defaultvalue} = $ind1_defaultvalue; >- $res->{$tag}->{ind2_defaultvalue} = $ind2_defaultvalue; >+ $res->{$tag}->{ind1_defaultvalue} = $ind1_defaultvalue; >+ $res->{$tag}->{ind2_defaultvalue} = $ind2_defaultvalue; > } > > $sth = $dbh->prepare( >diff --git a/admin/marctagstructure.pl b/admin/marctagstructure.pl >index e7560df..a8d7887 100755 >--- a/admin/marctagstructure.pl >+++ b/admin/marctagstructure.pl >@@ -98,7 +98,7 @@ if ($op eq 'add_form') { > #---- if primkey exists, it's a modify action, so read values to modify... > my $data; > if ($searchfield) { >- $sth=$dbh->prepare("select tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value,ind1_defaultvalue,ind2_defaultvalue from marc_tag_structure where tagfield=? and frameworkcode=?"); >+ $sth=$dbh->prepare("select tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value,ind1_defaultvalue,ind2_defaultvalue from marc_tag_structure where tagfield=? and frameworkcode=?"); > $sth->execute($searchfield,$frameworkcode); > $data=$sth->fetchrow_hashref; > } >@@ -121,11 +121,11 @@ if ($op eq 'add_form') { > $template->param('use_heading_flags_p' => 1); > $template->param(liblibrarian => $data->{'liblibrarian'}, > libopac => $data->{'libopac'}, >- repeatable => $data->{'repeatable'}, >- mandatory => $data->{'mandatory'}, >+ repeatable => $data->{'repeatable'}, >+ mandatory => $data->{'mandatory'}, > authorised_value => $authorised_value, >- ind1_defaultvalue => $data->{'ind1_defaultvalue'}, >- ind2_defaultvalue => $data->{'ind2_defaultvalue'}, >+ ind1_defaultvalue => $data->{'ind1_defaultvalue'}, >+ ind2_defaultvalue => $data->{'ind2_defaultvalue'}, > frameworkcode => $frameworkcode, > ); # FIXME: move checkboxes to presentation layer > # END $OP eq ADD_FORM >@@ -138,8 +138,8 @@ if ($op eq 'add_form') { > my $repeatable = $input->param('repeatable') ? 1 : 0; > my $mandatory = $input->param('mandatory') ? 1 : 0; > my $authorised_value = $input->param('authorised_value'); >- my $ind1_defaultvalue = $input->param('ind1_defaultvalue'); >- my $ind2_defaultvalue = $input->param('ind2_defaultvalue'); >+ my $ind1_defaultvalue = $input->param('ind1_defaultvalue'); >+ my $ind2_defaultvalue = $input->param('ind2_defaultvalue'); > unless (C4::Context->config('demo')) { > if ($input->param('modif')) { > $sth = $dbh->prepare( >@@ -150,8 +150,8 @@ if ($op eq 'add_form') { > $repeatable, > $mandatory, > $authorised_value, >- $ind1_defaultvalue, >- $ind2_defaultvalue, >+ $ind1_defaultvalue, >+ $ind2_defaultvalue, > $frameworkcode, > $tagfield > ); >@@ -165,8 +165,8 @@ if ($op eq 'add_form') { > $repeatable, > $mandatory, > $authorised_value, >- $ind1_defaultvalue, >- $ind2_defaultvalue, >+ $ind1_defaultvalue, >+ $ind2_defaultvalue, > $frameworkcode > ); > } >@@ -181,7 +181,7 @@ if ($op eq 'add_form') { > ################## DELETE_CONFIRM ################################## > # called by default form, used to confirm deletion of data in DB > } elsif ($op eq 'delete_confirm') { >- $sth=$dbh->prepare("select tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value,ind1_defaultvalue,ind2_defaultvalue from marc_tag_structure where tagfield=? and frameworkcode=?"); >+ $sth=$dbh->prepare("select tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value,ind1_defaultvalue,ind2_defaultvalue from marc_tag_structure where tagfield=? and frameworkcode=?"); > $sth->execute($searchfield, $frameworkcode); > my $data = $sth->fetchrow_hashref; > $template->param( >@@ -244,8 +244,8 @@ if ($op eq 'add_form') { > marc_tag_structure.repeatable as mts_repeatable, > marc_tag_structure.mandatory as mts_mandatory, > marc_tag_structure.authorised_value as mts_authorized_value, >- marc_tag_structure.ind1_defaultvalue as mts_ind1_defaultvalue, >- marc_tag_structure.ind1_defaultvalue as mts_ind2_defaultvalue, >+ marc_tag_structure.ind1_defaultvalue as mts_ind1_defaultvalue, >+ marc_tag_structure.ind1_defaultvalue as mts_ind2_defaultvalue, > marc_subfield_structure.* > FROM marc_tag_structure > LEFT JOIN marc_subfield_structure ON (marc_tag_structure.tagfield=marc_subfield_structure.tagfield AND marc_tag_structure.frameworkcode=marc_subfield_structure.frameworkcode) WHERE (marc_tag_structure.tagfield >= ? and marc_tag_structure.frameworkcode=?) AND marc_subfield_structure.tab>=0 ORDER BY marc_tag_structure.tagfield,marc_subfield_structure.tagsubfield"); >@@ -267,8 +267,8 @@ if ($op eq 'add_form') { > $row_data{repeatable} = $results[$i]->{'mts_repeatable'}; > $row_data{mandatory} = $results[$i]->{'mts_mandatory'}; > $row_data{authorised_value} = $results[$i]->{'mts_authorised_value'}; >- $row_data{ind1_defaultvalue} = $results[$i]->{'mts_ind1_defaultvalue'}; >- $row_data{ind2_defaultvalue} = $results[$i]->{'mts_ind2_defaultvalue'}; >+ $row_data{ind1_defaultvalue} = $results[$i]->{'mts_ind1_defaultvalue'}; >+ $row_data{ind2_defaultvalue} = $results[$i]->{'mts_ind2_defaultvalue'}; > $row_data{subfield_link} = "marc_subfields_structure.pl?op=add_form&tagfield=".$results[$i]->{'mts_tagfield'}."&frameworkcode=".$frameworkcode; > $row_data{edit} = "$script_name?op=add_form&searchfield=" .$results[$i]->{'mts_tagfield'}."&frameworkcode=".$frameworkcode; > $row_data{delete} = "$script_name?op=delete_confirm&searchfield=" .$results[$i]->{'mts_tagfield'}."&frameworkcode=".$frameworkcode; >@@ -308,8 +308,8 @@ if ($op eq 'add_form') { > $row_data{repeatable} = $results->[$i]{'repeatable'}; > $row_data{mandatory} = $results->[$i]{'mandatory'}; > $row_data{authorised_value} = $results->[$i]{'authorised_value'}; >- $row_data{ind1_defaultvalue} = $results->[$i]{'ind1_defaultvalue'}; >- $row_data{ind2_defaultvalue} = $results->[$i]{'ind2_defaultvalue'}; >+ $row_data{ind1_defaultvalue} = $results->[$i]{'ind1_defaultvalue'}; >+ $row_data{ind2_defaultvalue} = $results->[$i]{'ind2_defaultvalue'}; > $row_data{subfield_link} = "marc_subfields_structure.pl?tagfield=" .$results->[$i]{'tagfield'}."&frameworkcode=".$frameworkcode; > $row_data{edit} = "$script_name?op=add_form&searchfield=" .$results->[$i]{'tagfield'}."&frameworkcode=".$frameworkcode; > $row_data{delete} = "$script_name?op=delete_confirm&searchfield=".$results->[$i]{'tagfield'}."&frameworkcode=".$frameworkcode; >@@ -358,11 +358,11 @@ sub StringSearch { > sub duplicate_framework { > my ($newframeworkcode,$oldframeworkcode) = @_; > my $dbh = C4::Context->dbh; >- my $sth = $dbh->prepare("select tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value,ind1_defaultvalue,ind2_defaulvalue from marc_tag_structure where frameworkcode=?"); >+ my $sth = $dbh->prepare("select tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value,ind1_defaultvalue,ind2_defaulvalue from marc_tag_structure where frameworkcode=?"); > $sth->execute($oldframeworkcode); >- my $sth_insert = $dbh->prepare("insert into marc_tag_structure (tagfield, liblibrarian, libopac, repeatable, mandatory, authorised_value, ind1_defaultvalue, ind2_defaultvalue, frameworkcode) values (?,?,?,?,?,?,?,?,?)"); >- while ( my ($tagfield,$liblibrarian,$libopac,$repeatable,$mandatory,$authorised_value,$ind1_defaultvalue,$ind2_defaultvalue) = $sth->fetchrow) { >- $sth_insert->execute($tagfield,$liblibrarian,$libopac,$repeatable,$mandatory,$authorised_value,$ind1_defaultvalue,$ind2_defaultvalue,$newframeworkcode); >+ my $sth_insert = $dbh->prepare("insert into marc_tag_structure (tagfield, liblibrarian, libopac, repeatable, mandatory, authorised_value, ind1_defaultvalue, ind2_defaultvalue, frameworkcode) values (?,?,?,?,?,?,?,?,?)"); >+ while ( my ($tagfield,$liblibrarian,$libopac,$repeatable,$mandatory,$authorised_value,$ind1_defaultvalue,$ind2_defaultvalue) = $sth->fetchrow) { >+ $sth_insert->execute($tagfield,$liblibrarian,$libopac,$repeatable,$mandatory,$authorised_value,$ind1_defaultvalue,$ind2_defaultvalue,$newframeworkcode); > } > > $sth = $dbh->prepare("select frameworkcode,tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,kohafield,tab,authorised_value,authtypecode,value_builder,seealso,hidden from marc_subfield_structure where frameworkcode=?"); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt >index e493495..f025508 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt >@@ -94,10 +94,10 @@ $(document).ready(function() { > [% END %] > </li> > <li><label for="ind1_defaultvalue">First indicator default value: </label> >- <input id="ind1_defaultvalue" type="text" name="ind1_defaultvalue" value="[% ind1_defaultvalue |html %]" maxlength="1" size="1" /> >+ <input id="ind1_defaultvalue" type="text" name="ind1_defaultvalue" value="[% ind1_defaultvalue |html %]" maxlength="1" size="1" /> > </li> > <li><label for="ind2_defaultvalue">Second indicator default value: </label> >- <input id="ind2_defaultvalue" type="text" name="ind2_defaultvalue" value="[% ind2_defaultvalue |html %]" maxlength="1" size="1" /> >+ <input id="ind2_defaultvalue" type="text" name="ind2_defaultvalue" value="[% ind2_defaultvalue |html %]" maxlength="1" size="1" /> > </li> > <li><label for="authorised_value">Authorized value: </label> > <select name="authorised_value" id="authorised_value" size="1"> >@@ -195,8 +195,8 @@ $(document).ready(function() { > <th>Repeatable</th> > <th>Mandatory</th> > <th>Auth value</th> >- <th>Indic1</th> >- <th>Indic2</th> >+ <th>Ind. 1</th> >+ <th>Ind. 2</th> > <th>Subfields</th> > <th>Edit</th> > <th>Delete</th> >@@ -219,8 +219,8 @@ $(document).ready(function() { > <td>[% IF ( loo.repeatable ) %]Yes[% ELSE %]No[% END %]</td> > <td>[% IF ( loo.mandatory ) %]Yes[% ELSE %]No[% END %]</td> > <td>[% loo.authorised_value %]</td> >- <td>[% loo.ind1_defaultvalue %]</td> >- <td>[% loo.ind2_defaultvalue %]</td> >+ <td>[% loo.ind1_defaultvalue %]</td> >+ <td>[% loo.ind2_defaultvalue %]</td> > <td><a href="[% loo.subfield_link %]">subfields</a></td> > <td><a href="[% loo.edit %]">Edit</a></td> > <td><a href="[% loo.delete %]">Delete</a></td> >@@ -234,8 +234,8 @@ $(document).ready(function() { > <td>[% IF ( loo.repeatable ) %]Yes[% ELSE %]No[% END %]</td> > <td>[% IF ( loo.mandatory ) %]Yes[% ELSE %]No[% END %]</td> > <td>[% loo.authorised_value %]</td> >- <td>[% loo.ind1_defaultvalue %]</td> >- <td>[% loo.ind2_defaultvalue %]</td> >+ <td>[% loo.ind1_defaultvalue %]</td> >+ <td>[% loo.ind2_defaultvalue %]</td> > <td><a href="[% loo.subfield_link %]">Subfields</a></td> > <td><a href="[% loo.edit %]">Edit</a></td> > <td><a href="[% loo.delete %]">Delete</a></td> >-- >1.9.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 9701
:
52054
|
52082
|
52161
|
52171
|
52172
|
52173
|
53403
|
53404
|
71929
|
71930
|
71931
|
72010
|
72011
|
72012
|
72986
|
73780
|
73781
|
73782
|
73783
|
73843
|
73844
|
73845