[Koha-patches] [PATCH] Bug-2170: Adding-edititems-user-permission
Joshua Ferraro
jmf at liblime.com
Fri May 30 18:46:18 CEST 2008
Hey Mason,
Looking better ... however,
missing a TMPL_IF before { text: _("Edit as New (Duplicate)") ,
evident by the closing <!-- /TMPL_IF -->. It should have a TMPL_IF
CAN_user_editcatalogue as people without that privilege shouldn't
have the duplicate link showing up.
Cheers,
Josh
On Wed, May 28, 2008 at 05:18:19AM +1200, Mason James wrote:
> ---
> C4/Auth.pm | 3 +-
> cataloguing/additem.pl | 1 +
> .../intranet-tmpl/prog/en/includes/cat-toolbar.inc | 36 ++++++++++++--------
> .../prog/en/modules/catalogue/moredetail.tmpl | 2 +-
> 4 files changed, 26 insertions(+), 16 deletions(-)
>
> diff --git a/C4/Auth.pm b/C4/Auth.pm
> index 3951892..e9e5704 100755
> --- a/C4/Auth.pm
> +++ b/C4/Auth.pm
> @@ -160,7 +160,7 @@ sub get_template_and_user {
> my $all_perms = get_all_subpermissions();
>
> my @flagroots = qw(circulate catalogue parameters borrowers permissions reserveforothers borrow
> - editcatalogue updatecharges management tools editauthorities serials reports);
> + editcatalogue edititems updatecharges management tools editauthorities serials reports);
> # We are going to use the $flags returned by checkauth
> # to create the template's parameters that will indicate
> # which menus the user can access.
> @@ -173,6 +173,7 @@ sub get_template_and_user {
> $template->param( CAN_user_reserveforothers => 1 );
> $template->param( CAN_user_borrow => 1 );
> $template->param( CAN_user_editcatalogue => 1 );
> + $template->param( CAN_user_edititems => 1 );
> $template->param( CAN_user_updatecharges => 1 );
> $template->param( CAN_user_acquisition => 1 );
> $template->param( CAN_user_management => 1 );
> diff --git a/cataloguing/additem.pl b/cataloguing/additem.pl
> index 79b2264..41985d2 100755
> --- a/cataloguing/additem.pl
> +++ b/cataloguing/additem.pl
> @@ -72,6 +72,7 @@ my ($template, $loggedinuser, $cookie)
> type => "intranet",
> authnotrequired => 0,
> flagsrequired => {editcatalogue => 1},
> + flagsrequired => {edititems => 1},
> debug => 1,
> });
>
> diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
> index 99017cb..5b18611 100644
> --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
> +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
> @@ -43,14 +43,20 @@ function confirm_deletion() {
>
> // YUI Toolbar Functions
>
> - function yuiToolbar() {
> - var editmenu = [
> - { text: _("Edit Record"), url: "/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&frameworkcode=&op=" },
> - { text: _("Edit Items"), url: "/cgi-bin/koha/cataloguing/additem.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" },
> - { text: _("Edit as New (Duplicate)"), url: "/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&frameworkcode=&op=duplicate" },
> - { text: _("Delete Record"), onclick: {fn: confirm_deletion }<!-- TMPL_IF NAME="count" -->,id:'disabled'<!-- /TMPL_IF --> }
> - ];
> -
> + function yuiToolbar() {
> + var editmenu = [
> + <!-- TMPL_IF NAME="CAN_user_editcatalogue" -->
> + { text: _("Edit Record"), url: "/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&frameworkcode=&op=" },
> + <!-- /TMPL_IF -->
> + <!-- TMPL_IF NAME="CAN_user_edititems" -->
> + { text: _("Edit Items"), url: "/cgi-bin/koha/cataloguing/additem.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" },
> + <!-- /TMPL_IF -->
> + { text: _("Edit as New (Duplicate)"), url: "/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&frameworkcode=&op=duplicate" },
> + { text: _("Delete Record"), <!-- TMPL_IF NAME="count" -->disabled: true, <!-- /TMPL_IF --> onclick: {fn: confirm_deletion }},
> + <!-- /TMPL_IF -->
> +
> + ];
> +
> var savemenu = [
> { text: _("MODS (XML)"), url: "/cgi-bin/koha/catalogue/export.pl?format=mods&op=export&bib=<!-- TMPL_VAR NAME="biblionumber" -->" },
> { text: _("Dublin Core (XML)"), url: "/cgi-bin/koha/catalogue/export.pl?format=dc&op=export&bib=<!-- TMPL_VAR NAME="biblionumber" -->" },
> @@ -101,12 +107,14 @@ function confirm_deletion() {
> </script>
>
> <ul class="toolbar">
> - <!-- TMPL_IF NAME="CAN_user_editcatalogue" -->
> - <li><a id="newbiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl">New</a></li>
> -
> - <li id="editmenuc"><a id="editbiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&frameworkcode=<!--TMPL_VAR Name="current_framework" -->&op=">Edit Record</a></li>
> - <li><a id="edititems" href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Edit Items</a></li>
> - <li><a id="duplicatebiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&frameworkcode=<!--TMPL_VAR Name="current_framework" -->&op=duplicate">Duplicate Record</a></li>
> +
> + <!-- TMPL_IF NAME="CAN_user_editcatalogue"<li><a id="newbiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl">New</a></li><!-- /TMPL_IF -->
> + <!-- TMPL_IF EXPR="CAN_user_editcatalogue || CAN_user_edititems" --><li id="editmenuc"><!-- /TMPL_IF -->
> + <!-- TMPL_IF NAME="CAN_user_editcatalogue"
> +<a id="editbiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&frameworkcode=<!--TMPL_VAR Name="current_framework" -->&op=">Edit Record</a></li>
> + <!-- TMPL_IF NAME="CAN_user_edititems" -->
> + <li><a id="edititems" href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Edit Items-h</a></li>
> + <!-- /TMPL_IF -->
> <li><a id="deletebiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl?op=delete&biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Delete</a></li>
> <!-- /TMPL_IF -->
> <li id="addtoshelfc"><a id="addtoshelf" href="/cgi-bin/koha/virtualshelves/addbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Add to shelf</a></li>
> 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 3149559..ba9dbd1 100644
> --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl
> +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl
> @@ -41,7 +41,7 @@
> <!-- TMPL_LOOP NAME="ITEM_DATA" -->
> <div class="yui-g">
> <h3 id="item<!-- TMPL_VAR NAME="itemnumber" -->">Barcode <!-- TMPL_VAR NAME="barcode" --> <!-- TMPL_IF name="notforloantext" --><!-- TMPL_VAR name="notforloantext" --> <!-- /TMPL_IF --></h3>
> - <div class="listgroup"><h4>Item Information <!-- TMPL_IF NAME="CAN_user_editcatalogue" --><!-- TMPL_UNLESS name="nomod" --><a href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&biblionumber=<!-- TMPL_VAR NAME="biblionumber"-->&itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->">[Edit Items]</a><!-- /TMPL_IF --><!-- /TMPL_UNLESS --></h4>
> + <div class="listgroup"><h4>Item Information <!-- TMPL_IF NAME="CAN_user_edititems" --><!-- TMPL_UNLESS name="nomod" --><a href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&biblionumber=<!-- TMPL_VAR NAME="biblionumber"-->&itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->">[Edit Items]</a><!-- /TMPL_IF --><!-- /TMPL_UNLESS --></h4>
> <ol class="bibliodetails">
> <li><span class="label">Home Library:</span> <!-- TMPL_VAR NAME="homebranchname" --> </li>
> <!-- TMPL_IF NAME="item-level_itypes" -->
> --
> 1.5.4.2
>
> _______________________________________________
> Koha-patches mailing list
> Koha-patches at lists.koha.org
> http://lists.koha.org/mailman/listinfo/koha-patches
More information about the Koha-patches
mailing list