Bugzilla – Attachment 71930 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-str.patch (text/plain), 8.79 KB, created by
Josef Moravec
on 2018-02-19 10:40:54 UTC
(
hide
)
Description:
Bug 9701: (QA follow-up) Fix indentation and some strings
Filename:
MIME Type:
Creator:
Josef Moravec
Created:
2018-02-19 10:40:54 UTC
Size:
8.79 KB
patch
obsolete
>From ebb0a1013e959e4082acd2170c55260831b1cb5b 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. >--- > C4/Biblio.pm | 4 +- > admin/marctagstructure.pl | 52 +++++++++++----------- > .../prog/en/modules/admin/marctagstructure.tt | 4 +- > 3 files changed, 30 insertions(+), 30 deletions(-) > >diff --git a/C4/Biblio.pm b/C4/Biblio.pm >index cb8639d..368b2f5 100644 >--- a/C4/Biblio.pm >+++ b/C4/Biblio.pm >@@ -995,8 +995,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 b900a28..987bd89 100755 >--- a/admin/marctagstructure.pl >+++ b/admin/marctagstructure.pl >@@ -89,7 +89,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; > } >@@ -128,29 +128,29 @@ if ($op eq 'add_form') { > $sth = $dbh->prepare( > "UPDATE marc_tag_structure SET liblibrarian=? ,libopac=? ,repeatable=? ,mandatory=? ,authorised_value=?, ind1_defaultvalue=?, ind2_defaultvalue=? WHERE frameworkcode=? AND tagfield=?" > ); >- $sth->execute( $liblibrarian, >- $libopac, >- $repeatable, >- $mandatory, >- $authorised_value, >- $ind1_defaultvalue, >- $ind2_defaultvalue, >- $frameworkcode, >- $tagfield >+ $sth->execute( $liblibrarian, >+ $libopac, >+ $repeatable, >+ $mandatory, >+ $authorised_value, >+ $ind1_defaultvalue, >+ $ind2_defaultvalue, >+ $frameworkcode, >+ $tagfield > ); > } else { > $sth = $dbh->prepare( > "INSERT INTO marc_tag_structure (tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value,ind1_defaultvalue,ind2_defaultvalue,frameworkcode) values (?,?,?,?,?,?,?,?,?)" > ); >- $sth->execute($tagfield, >- $liblibrarian, >- $libopac, >- $repeatable, >- $mandatory, >- $authorised_value, >- $ind1_defaultvalue, >- $ind2_defaultvalue, >- $frameworkcode >+ $sth->execute( $tagfield, >+ $liblibrarian, >+ $libopac, >+ $repeatable, >+ $mandatory, >+ $authorised_value, >+ $ind1_defaultvalue, >+ $ind2_defaultvalue, >+ $frameworkcode > ); > } > $cache->clear_from_cache("MarcStructure-0-$frameworkcode"); >@@ -163,7 +163,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( >@@ -223,8 +223,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"); >@@ -246,8 +246,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; >@@ -293,8 +293,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; >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 b2e94e8..366e99e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt >@@ -80,10 +80,10 @@ > [% 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"> >-- >2.1.4
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