Bugzilla – Attachment 45056 Details for
Bug 14895
We shouldn't be able to edit already added serials' items from serial receive/edit page
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 14895 [QA Followup] - Fix indentation for readability
Bug-14895-QA-Followup---Fix-indentation-for-readab.patch (text/plain), 8.54 KB, created by
Kyle M Hall
on 2015-11-20 14:56:24 UTC
(
hide
)
Description:
Bug 14895 [QA Followup] - Fix indentation for readability
Filename:
MIME Type:
Creator:
Kyle M Hall
Created:
2015-11-20 14:56:24 UTC
Size:
8.54 KB
patch
obsolete
>From 78b513071cf8eb722836620e7fb642901772071d Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatersolutions.com> >Date: Fri, 20 Nov 2015 14:53:04 +0000 >Subject: [PATCH] Bug 14895 [QA Followup] - Fix indentation for readability > >Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> >--- > .../prog/en/modules/serials/serials-edit.tt | 78 +++++++++++--------- > serials/serials-edit.pl | 19 ++--- > 2 files changed, 54 insertions(+), 43 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt >index b426cbc..a213161 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt >@@ -222,7 +222,6 @@ $(document).ready(function() { > <tr> > [% FOREACH item IN serialslis.items %] > [% IF ( item.itemid.substr(0,1) == "N" ) %] >- > <td colspan="6"> > <a id="label[% serialslis.subscriptionid %][% serialslis.serialid %]" style="color: grey; font-size: 80%; cursor: pointer;" onclick="unHideItems('items[% serialslis.subscriptionid %][% serialslis.serialid %]','label[% serialslis.subscriptionid %][% serialslis.serialid %]', '[% serialslis.serialid %]');setStatus([% serialslis.serialid %]);"> > Click to add item</a> >@@ -233,40 +232,51 @@ $(document).ready(function() { > <div class="cataloguing_additem_itemlist"> > > <div id="item[% item.serialid %][% item.countitems %]" class="items"> >- <ol>[% FOREACH iteminformatio IN item.iteminformation %]<li> >- <div class="subfield_line" style="[% iteminformatio.hidden %]" id="subfield[% item.serialid %][% item.countitems %][% iteminformatio.subfield %][% iteminformatio.random %]"> >- [% IF (iteminformatio.mandatory) %] >- <label class="required">[% iteminformatio.subfield %] - [% iteminformatio.marc_lib %]</label> >- [% ELSE %] >- <label>[% iteminformatio.subfield %] - [% iteminformatio.marc_lib %]</label> >- [% END %] >- [% IF ( iteminformatio.marc_value.type == 'select' ) %] >- <select name="field_value" size="1"> >- [% FOREACH value IN iteminformatio.marc_value.values %] >- [% IF ( value == iteminformatio.marc_value.default ) %] >- <option value="[% value %]" selected="selected">[% iteminformatio.marc_value.labels.$value %]</option> >- [% ELSE %] >- <option value="[% value %]">[% iteminformatio.marc_value.labels.$value %]</option> >- [% END %] >- [% END %] >- </select> >- [% ELSE %] >- [% iteminformatio.marc_value %] >- [% END %] >- <input type="hidden" name="itemid" value="[% item.itemid %]" /> >- <input type="hidden" name="kohafield" value="[% iteminformatio.kohafield %]" /> >- <input type="hidden" name="tag" value="[% iteminformatio.tag %]" /> >- <input type="hidden" name="subfield" value="[% iteminformatio.subfield %]" /> >- <input type="hidden" name="mandatory" value="[% iteminformatio.mandatory %]" /> >- [% IF ( iteminformatio.repeatable ) %] >- <a href="#" class="buttonPlus" onclick="CloneItemSubfield(this.parentNode); return false;"> >- <img src="[% interface %]/[% theme %]/img/clone-subfield.png" alt="Clone" title="Clone this subfield" /> >- </a> >+ <ol> >+ [% FOREACH iteminformatio IN item.iteminformation %] >+ <li> >+ <div class="subfield_line" style="[% iteminformatio.hidden %]" id="subfield[% item.serialid %][% item.countitems %][% iteminformatio.subfield %][% iteminformatio.random %]"> >+ [% IF (iteminformatio.mandatory) %] >+ <label class="required">[% iteminformatio.subfield %] - [% iteminformatio.marc_lib %]</label> >+ [% ELSE %] >+ <label>[% iteminformatio.subfield %] - [% iteminformatio.marc_lib %]</label> >+ [% END %] >+ >+ [% IF ( iteminformatio.marc_value.type == 'select' ) %] >+ <select name="field_value" size="1"> >+ [% FOREACH value IN iteminformatio.marc_value.values %] >+ [% IF ( value == iteminformatio.marc_value.default ) %] >+ <option value="[% value %]" selected="selected">[% iteminformatio.marc_value.labels.$value %]</option> >+ [% ELSE %] >+ <option value="[% value %]">[% iteminformatio.marc_value.labels.$value %]</option> >+ [% END %] >+ [% END %] >+ </select> >+ [% ELSE %] >+ [% iteminformatio.marc_value %] >+ [% END %] >+ >+ <input type="hidden" name="itemid" value="[% item.itemid %]" /> >+ <input type="hidden" name="kohafield" value="[% iteminformatio.kohafield %]" /> >+ <input type="hidden" name="tag" value="[% iteminformatio.tag %]" /> >+ <input type="hidden" name="subfield" value="[% iteminformatio.subfield %]" /> >+ <input type="hidden" name="mandatory" value="[% iteminformatio.mandatory %]" /> >+ >+ [% IF ( iteminformatio.repeatable ) %] >+ <a href="#" class="buttonPlus" onclick="CloneItemSubfield(this.parentNode); return false;"> >+ <img src="[% interface %]/[% theme %]/img/clone-subfield.png" alt="Clone" title="Clone this subfield" /> >+ </a> >+ [% END %] >+ >+ [% IF ( iteminformatio.mandatory ) %] >+ <span class="required">Required</span> >+ [% END %] >+ </div> >+ </li> > [% END %] >- [% IF ( iteminformatio.mandatory ) %] <span class="required">Required</span>[% END %] >- </div></li> >- [% END %]</ol></div><!-- /iteminformation --> >- >+ </ol> >+ </div><!-- /iteminformation --> >+ > <input type="hidden" name="moditem" value="" /> > <input type="hidden" name="tag" value="[% item.itemtagfield %]" /> > <input type="hidden" name="subfield" value="[% item.itemtagsubfield %]" /> >diff --git a/serials/serials-edit.pl b/serials/serials-edit.pl >index b1a3877..5d046f3 100755 >--- a/serials/serials-edit.pl >+++ b/serials/serials-edit.pl >@@ -268,9 +268,10 @@ if ( $op and $op eq 'serialchangestatus' ) { > my $countdistinct; > my $range = scalar(@itemid); > for ( my $i = 0 ; $i < $range ; $i++ ) { >- if (C4::Items::GetItem($itemid[$i])) { >- next(); >- } >+ if ( C4::Items::GetItem( $itemid[$i] ) ) { >+ next(); >+ } >+ > unless ( $itemhash{ $itemid[$i] } ) { > if ( $serials[$countdistinct] > && $serials[$countdistinct] ne "NEW" ) >@@ -284,12 +285,12 @@ if ( $op and $op eq 'serialchangestatus' ) { > $itemhash{ $itemid[$i] }->{'bibnum'} = $bibnums[$countdistinct]; > $countdistinct++; > } >- push @{ $itemhash{ $itemid[$i] }->{'tags'} }, $tags[$i]; >- push @{ $itemhash{ $itemid[$i] }->{'subfields'} }, $subfields[$i]; >- push @{ $itemhash{ $itemid[$i] }->{'field_values'} }, >- $field_values[$i]; >- push @{ $itemhash{ $itemid[$i] }->{'ind_tag'} }, $ind_tag[$i]; >- push @{ $itemhash{ $itemid[$i] }->{'indicator'} }, $indicator[$i]; >+ >+ push @{ $itemhash{ $itemid[$i] }->{'tags'} }, $tags[$i]; >+ push @{ $itemhash{ $itemid[$i] }->{'subfields'} }, $subfields[$i]; >+ push @{ $itemhash{ $itemid[$i] }->{'field_values'} }, $field_values[$i]; >+ push @{ $itemhash{ $itemid[$i] }->{'ind_tag'} }, $ind_tag[$i]; >+ push @{ $itemhash{ $itemid[$i] }->{'indicator'} }, $indicator[$i]; > } > foreach my $item ( keys %itemhash ) { > >-- >1.7.10.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 14895
:
42867
|
42868
|
42869
|
44937
|
45055
| 45056