#
# This file is part of Koha.
#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-# You should have received a copy of the GNU General Public License along
-# with Koha; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
use strict;
#use warnings; FIXME - Bug 2505
-use CGI;
+use CGI qw ( -utf8 );
use C4::Auth;
use C4::Output;
use C4::Biblio;
use C4::Items;
use C4::Context;
+use C4::Circulation;
use C4::Koha; # XXX subfield_is_koha_internal_p
use C4::Branch; # XXX subfield_is_koha_internal_p
use C4::ClassSource;
use C4::Search;
use Storable qw(thaw freeze);
use URI::Escape;
-
+use C4::Members;
use MARC::File::XML;
use URI::Escape;
sub generate_subfield_form {
- my ($tag, $subfieldtag, $value, $tagslib,$subfieldlib, $branches, $today_iso, $biblionumber, $temp, $loop_data, $i) = @_;
+ my ($tag, $subfieldtag, $value, $tagslib,$subfieldlib, $branches, $today_iso, $biblionumber, $temp, $loop_data, $i, $restrictededition) = @_;
- my $frameworkcode = &GetFrameworkCode($biblionumber);
+ my $frameworkcode = &GetFrameworkCode($biblionumber);
+
my %subfield_data;
my $dbh = C4::Context->dbh;
$subfield_data{tag} = $tag;
$subfield_data{subfield} = $subfieldtag;
- $subfield_data{random} = int(rand(1000000)); # why do we need 2 different randoms?
$subfield_data{marc_lib} ="<span id=\"error$i\" title=\"".$subfieldlib->{lib}."\">".$subfieldlib->{lib}."</span>";
$subfield_data{mandatory} = $subfieldlib->{mandatory};
$subfield_data{repeatable} = $subfieldlib->{repeatable};
$value =~ s/DD/$day/g;
}
- $subfield_data{visibility} = "display:none;" if (($subfieldlib->{hidden} > 4) || ($subfieldlib->{hidden} < -4));
+ $subfield_data{visibility} = "display:none;" if (($subfieldlib->{hidden} > 4) || ($subfieldlib->{hidden} <= -4));
my $pref_itemcallnumber = C4::Context->preference('itemcallnumber');
if (!$value && $subfieldlib->{kohafield} eq 'items.itemcallnumber' && $pref_itemcallnumber) {
my $input = new CGI;
$value = $input->param('barcode');
}
- my $attributes_no_value = qq(tabindex="1" id="$subfield_data{id}" name="field_value" class="input_marceditor" size="67" maxlength="$subfield_data{maxlength}" );
+ my $attributes_no_value = qq(id="$subfield_data{id}" name="field_value" class="input_marceditor" size="50" maxlength="$subfield_data{maxlength}" );
+ my $attributes_no_value_textarea = qq(id="$subfield_data{id}" name="field_value" class="input_marceditor" rows="5" cols="64" );
+
+ # Getting list of subfields to keep when restricted editing is enabled
+ my $subfieldsToAllowForRestrictedEditing = C4::Context->preference('SubfieldsToAllowForRestrictedEditing');
+ my $allowAllSubfields = (
+ not defined $subfieldsToAllowForRestrictedEditing
+ or $subfieldsToAllowForRestrictedEditing == q||
+ ) ? 1 : 0;
+ my @subfieldsToAllow = split(/ /, $subfieldsToAllowForRestrictedEditing);
+
+ # If we're on restricted editing, and our field is not in the list of subfields to allow,
+ # then it is read-only
+ $attributes_no_value .= 'readonly="readonly" '
+ if (
+ not $allowAllSubfields
+ and $restrictededition
+ and !grep { $tag . '$' . $subfieldtag eq $_ } @subfieldsToAllow
+ );
+
my $attributes = qq($attributes_no_value value="$value" );
if ( $subfieldlib->{authorised_value} ) {
}
}
- if ($subfieldlib->{'hidden'}) {
+ if ( $subfieldlib->{hidden} > 4 or $subfieldlib->{hidden} <= -4 ) {
$subfield_data{marc_value} = qq(<input type="hidden" $attributes /> $authorised_lib{$value});
}
else {
- $subfield_data{marc_value} =CGI::scrolling_list( # FIXME: factor out scrolling_list
+ my @scrparam = (
-name => "field_value",
-values => \@authorised_values,
-default => $value,
-override => 1,
-size => 1,
-multiple => 0,
- -tabindex => 1,
-id => "tag_".$tag."_subfield_".$subfieldtag."_".$index_subfield,
-class => "input_marceditor",
);
+
+ # If we're on restricted editing, and our field is not in the list of subfields to allow,
+ # then it is read-only
+ push @scrparam, (-readonly => "readonly"), (-disabled => "disabled")
+ if (
+ not $allowAllSubfields
+ and $restrictededition
+ and !grep { $tag . '$' . $subfieldtag eq $_ } @subfieldsToAllow
+ );
+ $subfield_data{marc_value} =CGI::scrolling_list(@scrparam);
}
}
";
}
# it's a plugin field
- elsif ( $subfieldlib->{value_builder} ) {
- # opening plugin
- my $plugin = C4::Context->intranetdir . "/cataloguing/value_builder/" . $subfieldlib->{'value_builder'};
- if (do $plugin) {
- my $extended_param = plugin_parameters( $dbh, $temp, $tagslib, $subfield_data{id}, $loop_data );
- my ( $function_name, $javascript ) = plugin_javascript( $dbh, $temp, $tagslib, $subfield_data{id}, $loop_data );
- my $change = index($javascript, 'function Change') > -1 ?
- "return Change$function_name($subfield_data{random}, '$subfield_data{id}');" :
- 'return 1;';
- $subfield_data{marc_value} = qq[<input type="text" $attributes
- onfocus="Focus$function_name($subfield_data{random}, '$subfield_data{id}');"
- onchange=" $change"
- onblur=" Blur$function_name($subfield_data{random}, '$subfield_data{id}');" />
- <a href="#" class="buttonDot" onclick="Clic$function_name('$subfield_data{id}'); return false;" title="Tag Editor">...</a>
- $javascript];
- } else {
- warn "Plugin Failed: $plugin";
- $subfield_data{marc_value} = "<input type=\"text\" $attributes />"; # supply default input form
- }
+ elsif ( $subfieldlib->{value_builder} ) { # plugin
+ require Koha::FrameworkPlugin;
+ my $plugin = Koha::FrameworkPlugin->new({
+ name => $subfieldlib->{'value_builder'},
+ item_style => 1,
+ });
+ my $pars= { dbh => $dbh, record => $temp, tagslib =>$tagslib,
+ id => $subfield_data{id}, tabloop => $loop_data };
+ $plugin->build( $pars );
+ if( !$plugin->errstr ) {
+ #TODO Report 12176 will make this even better !
+ my $class= 'buttonDot'. ( $plugin->noclick? ' disabled': '' );
+ my $title= $plugin->noclick? 'No popup': 'Tag editor';
+ $subfield_data{marc_value} = qq[<input type="text" $attributes /><a href="#" id="buttonDot_$subfield_data{id}" class="$class" title="$title">...</a>\n].$plugin->javascript;
+ } else {
+ warn $plugin->errstr;
+ $subfield_data{marc_value} = "<input type=\"text\" $attributes />"; # supply default input form
+ }
}
elsif ( $tag eq '' ) { # it's an hidden field
$subfield_data{marc_value} = qq(<input type="hidden" $attributes />);
500 <= $tag && $tag < 600 )
) {
# oversize field (textarea)
- $subfield_data{marc_value} = "<textarea $attributes_no_value>$value</textarea>\n";
+ $subfield_data{marc_value} = "<textarea $attributes_no_value_textarea>$value</textarea>\n";
} else {
# it's a standard field
$subfield_data{marc_value} = "<input type=\"text\" $attributes />";
my $op = $input->param('op');
my $hostitemnumber = $input->param('hostitemnumber');
my $marcflavour = C4::Context->preference("marcflavour");
+my $searchid = $input->param('searchid');
+# fast cataloguing datas
+my $fa_circborrowernumber = $input->param('circborrowernumber');
+my $fa_barcode = $input->param('barcode');
+my $fa_branch = $input->param('branch');
+my $fa_stickyduedate = $input->param('stickyduedate');
+my $fa_duedatespec = $input->param('duedatespec');
my $frameworkcode = &GetFrameworkCode($biblionumber);
});
+# Does the user have a restricted item editing permission?
+my $uid = $loggedinuser ? GetMember( borrowernumber => $loggedinuser )->{userid} : undef;
+my $restrictededition = $uid ? haspermission($uid, {'editcatalogue' => 'edit_items_restricted'}) : undef;
+# In case user is a superlibrarian, editing is not restricted
+$restrictededition = 0 if ($restrictededition != 0 && C4::Context->IsSuperLibrarian());
+# In case user has fast cataloging permission (and we're in fast cataloging), editing is not restricted
+$restrictededition = 0 if ($restrictededition != 0 && $frameworkcode eq 'FA' && haspermission($uid, {'editcatalogue' => 'fast_cataloging'}));
+
my $today_iso = C4::Dates->today('iso');
my $tagslib = &GetMarcStructure(1,$frameworkcode);
my $record = GetMarcBiblio($biblionumber);
$record = _increment_barcode($record, $frameworkcode);
}
-
- if (C4::Context->preference('autoBarcode') eq 'incremental') {
- $record = _increment_barcode($record, $frameworkcode);
- }
-
my $addedolditem = TransformMarcToKoha( $dbh, $record );
# If we have to add or add & duplicate, we add the item
-name => 'LastCreatedItem',
# We uri_escape the whole freezed structure so we're sure we won't have any encoding problems
-value => uri_escape_utf8( freeze( $record ) ),
+ -HttpOnly => 1,
-expires => ''
);
undef($itemrecord);
}
}
- if ($frameworkcode eq 'FA' && $input->param('borrowernumber')){
- my $redirect_string = 'borrowernumber=' . uri_escape($input->param('borrowernumber')) .
- '&barcode=' . uri_escape($input->param('barcode'));
- $redirect_string .= '&duedatespec=' . uri_escape($input->param('duedatespec')) .
- '&stickyduedate=1';
- print $input->redirect("/cgi-bin/koha/circ/circulation.pl?" . $redirect_string);
- exit;
+ if ($frameworkcode eq 'FA' && $fa_circborrowernumber){
+ print $input->redirect(
+ '/cgi-bin/koha/circ/circulation.pl?'
+ .'borrowernumber='.$fa_circborrowernumber
+ .'&barcode='.uri_escape_utf8($fa_barcode)
+ .'&duedatespec='.$fa_duedatespec
+ .'&stickyduedate=1'
+ );
+ exit;
}
# check that there is no issue on this item before deletion.
$error = &DelItemCheck($dbh,$biblionumber,$itemnumber);
if($error == 1){
- print $input->redirect("additem.pl?biblionumber=$biblionumber&frameworkcode=$frameworkcode");
+ print $input->redirect("additem.pl?biblionumber=$biblionumber&frameworkcode=$frameworkcode&searchid=$searchid");
}else{
push @errors,$error;
$nextop="additem";
my $defaultview = C4::Context->preference('IntranetBiblioDefaultView');
my $views = { C4::Search::enabled_staff_search_views };
if ($defaultview eq 'isbd' && $views->{can_view_ISBD}) {
- print $input->redirect("/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=$biblionumber");
+ print $input->redirect("/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=$biblionumber&searchid=$searchid");
} elsif ($defaultview eq 'marc' && $views->{can_view_MARC}) {
- print $input->redirect("/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=$biblionumber");
+ print $input->redirect("/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=$biblionumber&searchid=$searchid");
} elsif ($defaultview eq 'labeled_marc' && $views->{can_view_labeledMARC}) {
- print $input->redirect("/cgi-bin/koha/catalogue/labeledMARCdetail.pl?biblionumber=$biblionumber");
+ print $input->redirect("/cgi-bin/koha/catalogue/labeledMARCdetail.pl?biblionumber=$biblionumber&searchid=$searchid");
} else {
- print $input->redirect("/cgi-bin/koha/catalogue/detail.pl?biblionumber=$biblionumber");
+ print $input->redirect("/cgi-bin/koha/catalogue/detail.pl?biblionumber=$biblionumber&searchid=$searchid");
}
exit;
}
ModItemFromMarc($itemtosave,$biblionumber,$itemnumber);
$itemnumber="";
}
+ my $item = GetItem( $itemnumber );
+ my $olditemlost = $item->{'itemlost'};
+
+ my ($lost_tag,$lost_subfield) = GetMarcFromKohaField("items.itemlost",'');
+
+ my $newitemlost = $itemtosave->subfield( $lost_tag, $lost_subfield );
+ if (($olditemlost eq '0' or $olditemlost eq '' ) and $newitemlost ge '1'){
+ LostItem($itemnumber,'MARK RETURNED');
+ }
$nextop="additem";
} elsif ($op eq "delinkitem"){
my $analyticfield = '773';
|| $subfieldvalue;
}
- if (($field->tag eq $branchtagfield) && ($subfieldcode eq $branchtagsubfield) && C4::Context->preference("IndependantBranches")) {
+ if (($field->tag eq $branchtagfield) && ($subfieldcode eq $branchtagsubfield) && C4::Context->preference("IndependentBranches")) {
#verifying rights
my $userenv = C4::Context->userenv();
- unless (($userenv->{'flags'} == 1) or (($userenv->{'branch'} eq $subfieldvalue))){
+ unless (C4::Context->IsSuperLibrarian() or (($userenv->{'branch'} eq $subfieldvalue))){
$this_row{'nomod'} = 1;
}
}
my $pref_itemcallnumber = C4::Context->preference('itemcallnumber');
-my $onlymine = C4::Context->preference('IndependantBranches') &&
- C4::Context->userenv &&
- C4::Context->userenv->{flags}!=1 &&
- C4::Context->userenv->{branch};
+my $onlymine =
+ C4::Context->preference('IndependentBranches')
+ && C4::Context->userenv
+ && !C4::Context->IsSuperLibrarian()
+ && C4::Context->userenv->{branch};
my $branch = $input->param('branch') || C4::Context->userenv->{branch};
my $branches = GetBranchesLoop($branch,$onlymine); # build once ahead of time, instead of multiple times later.
next if subfield_is_koha_internal_p($subfieldtag);
next if ($tagslib->{$tag}->{$subfieldtag}->{'tab'} ne "10");
- my $subfield_data = generate_subfield_form($tag, $subfieldtag, $value, $tagslib, $subfieldlib, $branches, $today_iso, $biblionumber, $temp, \@loop_data, $i);
-
+ my $subfield_data = generate_subfield_form($tag, $subfieldtag, $value, $tagslib, $subfieldlib, $branches, $today_iso, $biblionumber, $temp, \@loop_data, $i, $restrictededition);
push @fields, "$tag$subfieldtag";
push (@loop_data, $subfield_data);
$i++;
next if any { /^$tag$subtag$/ } @fields;
my @values = (undef);
- @values = $itemrecord->field($tag)->subfield($subtag) if ($itemrecord && defined($itemrecord->field($tag)->subfield($subtag)));
+ @values = $itemrecord->field($tag)->subfield($subtag) if ($itemrecord && defined($itemrecord->field($tag)) && defined($itemrecord->field($tag)->subfield($subtag)));
for my $value (@values){
- my $subfield_data = generate_subfield_form($tag, $subtag, $value, $tagslib, $tagslib->{$tag}->{$subtag}, $branches, $today_iso, $biblionumber, $temp, \@loop_data, $i);
+ my $subfield_data = generate_subfield_form($tag, $subtag, $value, $tagslib, $tagslib->{$tag}->{$subtag}, $branches, $today_iso, $biblionumber, $temp, \@loop_data, $i, $restrictededition);
push (@loop_data, $subfield_data);
$i++;
- }
+ }
}
}
@loop_data = sort {$a->{subfield} cmp $b->{subfield} } @loop_data;
# what's the next op ? it's what we are not in : an add if we're editing, otherwise, and edit.
-$template->param( title => $record->title() ) if ($record ne "-1");
$template->param(
biblionumber => $biblionumber,
title => $oldrecord->{title},
popup => $input->param('popup') ? 1: 0,
C4::Search::enabled_staff_search_views,
);
+$template->{'VARS'}->{'searchid'} = $searchid;
if ($frameworkcode eq 'FA'){
- $template->{VARS}->{'borrowernumber'}=$input->param('borrowernumber');
- $template->{VARS}->{'barcode'}=$input->param('barcode');
- $template->{VARS}->{'stickyduedate'}=$input->param('stickduedate');
- $template->{VARS}->{'duedatespec'}=$input->param('duedatespec');
-}
+ # fast cataloguing datas
+ $template->param(
+ 'circborrowernumber' => $fa_circborrowernumber,
+ 'barcode' => $fa_barcode,
+ 'branch' => $fa_branch,
+ 'stickyduedate' => $fa_stickyduedate,
+ 'duedatespec' => $fa_duedatespec,
+ );
+}
foreach my $error (@errors) {
$template->param($error => 1);
projects / srvgit / blobdiff