projects
/
koha.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
12c60fa
)
MT2938 : Adds a permission for editing items
author
Matthias Meusburger
<matthias.meusburger@biblibre.com>
Thu, 11 Feb 2010 13:33:54 +0000
(14:33 +0100)
committer
Henri-Damien LAURENT
<henridamien.laurent@biblibre.com>
Mon, 15 Feb 2010 16:43:12 +0000
(17:43 +0100)
catalogue/updateitem.pl
patch
|
blob
|
history
cataloguing/additem.pl
patch
|
blob
|
history
installer/data/mysql/updatedatabase30.pl
patch
|
blob
|
history
koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl
patch
|
blob
|
history
kohaversion.pl
patch
|
blob
|
history
diff --git
a/catalogue/updateitem.pl
b/catalogue/updateitem.pl
index
7b0b673
..
f270ddf
100755
(executable)
--- a/
catalogue/updateitem.pl
+++ b/
catalogue/updateitem.pl
@@
-57,6
+57,7
@@
for ($damaged,$itemlost,$wthdrawn) {
# modify MARC item if input differs from items table.
my $item_changes = {};
if (defined $itemnotes) { # i.e., itemnotes parameter passed from form
# modify MARC item if input differs from items table.
my $item_changes = {};
if (defined $itemnotes) { # i.e., itemnotes parameter passed from form
+ my ($loggedinuser, $cookie, $sessionID) = checkauth($cgi, 0, {editcatalogue => 'edit_items'}, 'intranet');
if ((not defined $item_data_hashref->{'itemnotes'}) or $itemnotes ne $item_data_hashref->{'itemnotes'}) {
$item_changes->{'itemnotes'} = $itemnotes;
}
if ((not defined $item_data_hashref->{'itemnotes'}) or $itemnotes ne $item_data_hashref->{'itemnotes'}) {
$item_changes->{'itemnotes'} = $itemnotes;
}
diff --git
a/cataloguing/additem.pl
b/cataloguing/additem.pl
index
e4c30e3
..
f91e352
100755
(executable)
--- a/
cataloguing/additem.pl
+++ b/
cataloguing/additem.pl
@@
-70,7
+70,7
@@
my ($template, $loggedinuser, $cookie)
query => $input,
type => "intranet",
authnotrequired => 0,
query => $input,
type => "intranet",
authnotrequired => 0,
- flagsrequired => {editcatalogue =>
1
},
+ flagsrequired => {editcatalogue =>
'edit_items'
},
debug => 1,
});
debug => 1,
});
diff --git
a/installer/data/mysql/updatedatabase30.pl
b/installer/data/mysql/updatedatabase30.pl
index
9c5a9e6
..
4097e56
100644
(file)
--- a/
installer/data/mysql/updatedatabase30.pl
+++ b/
installer/data/mysql/updatedatabase30.pl
@@
-738,6
+738,13
@@
if (C4::Context->preference('Version') < TransformToNum($DBversion)){
SetVersion ($DBversion);
}
SetVersion ($DBversion);
}
+$DBversion = '3.00.06.007';
+if (C4::Context->preference('Version') < TransformToNum($DBversion)){
+ $dbh->do("INSERT INTO `permissions` (`module_bit` , `code` , `description`) VALUES ('9', 'edit_items', 'Edit items');");
+ print "Upgrade to $DBversion done (Added 'Edit Items' permission)\n";
+ SetVersion ($DBversion);
+}
+
diff --git
a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl
index
0026405
..
a4d58a9
100644
(file)
--- a/
koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl
+++ b/
koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl
@@
-153,7
+153,7
@@
<!-- TMPL_IF NAME="card2" --><li><span class="label">Previous Borrower:</span> <a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=<!-- TMPL_VAR NAME="borrower2" -->"><!-- TMPL_VAR NAME="card2" --></a> </li><!-- /TMPL_IF -->
<li><span class="label">Paid for?:</span> <!-- TMPL_VAR NAME="paidfor" --> </li>
<li><span class="label">Public Note:</span>
<!-- TMPL_IF NAME="card2" --><li><span class="label">Previous Borrower:</span> <a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=<!-- TMPL_VAR NAME="borrower2" -->"><!-- TMPL_VAR NAME="card2" --></a> </li><!-- /TMPL_IF -->
<li><span class="label">Paid for?:</span> <!-- TMPL_VAR NAME="paidfor" --> </li>
<li><span class="label">Public Note:</span>
- <!-- TMPL_IF NAME="CAN_user_
circulate
" -->
+ <!-- TMPL_IF NAME="CAN_user_
editcatalogue_edit_items
" -->
<form class="inline" action="updateitem.pl" method="post"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR Name="biblionumber" -->" />
<input type="hidden" name="biblioitemnumber" value="<!-- TMPL_VAR Name="biblioitemnumber" -->" /><input type="hidden" name="itemnumber" value="<!-- TMPL_VAR Name="itemnumber" -->" />
<textarea name="itemnotes" rows="2" cols="30"><!-- TMPL_VAR NAME="itemnotes" --></textarea><input type="submit" name="submit" class="submit" value="Update" />
<form class="inline" action="updateitem.pl" method="post"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR Name="biblionumber" -->" />
<input type="hidden" name="biblioitemnumber" value="<!-- TMPL_VAR Name="biblioitemnumber" -->" /><input type="hidden" name="itemnumber" value="<!-- TMPL_VAR Name="itemnumber" -->" />
<textarea name="itemnotes" rows="2" cols="30"><!-- TMPL_VAR NAME="itemnotes" --></textarea><input type="submit" name="submit" class="submit" value="Update" />
diff --git
a/kohaversion.pl
b/kohaversion.pl
index
5dd8831
..
24e2092
100644
(file)
--- a/
kohaversion.pl
+++ b/
kohaversion.pl
@@
-10,7
+10,7
@@
use strict;
sub kohaversion {
use strict;
sub kohaversion {
- our $VERSION = '3.00.06.00
6
';
+ our $VERSION = '3.00.06.00
7
';
# version needs to be set this way
# so that it can be picked up by Makefile.PL
# during install
# version needs to be set this way
# so that it can be picked up by Makefile.PL
# during install