Bugzilla – Attachment 65232 Details for
Bug 18980
Add an explanation when Anyone permission has no actual effect
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 18980: Show distinction between shared and private lists in staff
Bug-18980-Show-distinction-between-shared-and-priv.patch (text/plain), 3.98 KB, created by
Marcel de Rooy
on 2017-07-25 14:49:04 UTC
(
hide
)
Description:
Bug 18980: Show distinction between shared and private lists in staff
Filename:
MIME Type:
Creator:
Marcel de Rooy
Created:
2017-07-25 14:49:04 UTC
Size:
3.98 KB
patch
obsolete
>From 8218f86ac6c122f529aaa135f6493c83e38c164c Mon Sep 17 00:00:00 2001 >From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >Date: Thu, 22 Jun 2017 10:14:29 +0200 >Subject: [PATCH] Bug 18980: Show distinction between shared and private lists > in staff >Content-Type: text/plain; charset=utf-8 > >Just as we show this distinction in OPAC, this patch adds a type column >in the Your lists tab that displays Private or Shared. It always contains >Public in the other tab. > >Test plan: >[1] Check if you see Shared for a private lists with shares in staff. >[2] Run t/db_dependent/Utils/Datatables_Virtualshelves.t > >Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> > >Signed-off-by: Lee Jamison <ldjamison@marywood.edu> >--- > C4/Utils/DataTables/VirtualShelves.pm | 1 + > koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt | 3 +++ > .../prog/en/modules/virtualshelves/tables/shelves_results.tt | 2 ++ > 3 files changed, 6 insertions(+) > >diff --git a/C4/Utils/DataTables/VirtualShelves.pm b/C4/Utils/DataTables/VirtualShelves.pm >index 28f579f..156b68c 100644 >--- a/C4/Utils/DataTables/VirtualShelves.pm >+++ b/C4/Utils/DataTables/VirtualShelves.pm >@@ -122,6 +122,7 @@ sub search { > my $s = Koha::Virtualshelves->find( $shelf->{shelfnumber} ); > $shelf->{can_manage_shelf} = $s->can_be_managed( $loggedinuser ); > $shelf->{can_delete_shelf} = $s->can_be_deleted( $loggedinuser ); >+ $shelf->{is_shared} = $s->is_shared; > } > return { > iTotalRecords => $iTotalRecords, >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt >index f26acd4..9dd7ea4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt >@@ -92,6 +92,7 @@ $(document).ready(function(){ > { 'mDataProp': 'dt_type' }, > { 'mDataProp': 'dt_shelfname' }, > { 'mDataProp': 'dt_count' }, >+ { 'mDataProp': 'dt_is_shared' }, > { 'mDataProp': 'dt_owner' }, > { 'mDataProp': 'dt_sortby' }, > { 'mDataProp': 'dt_created_on' }, >@@ -638,6 +639,7 @@ function AdjustRemark() { > <th class="NoVisible">Type</th> > <th>List name</th> > <th>Contents</th> >+ <th>Type</th> > <th>Owner</th> > <th>Sort by</th> > <th>Creation date</th> >@@ -648,6 +650,7 @@ function AdjustRemark() { > <th></th> > <th><input class="filter text_filter" id="searchshelfname_filter" placeholder="List name"></th> > <th></th> >+ <th></th> > <th><input class="filter text_filter" id="searchowner_filter" placeholder="Owner"></th> > <th> > <select class="filter text_filter" id="searchsortby_filter"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/tables/shelves_results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/tables/shelves_results.tt >index bf1305a..2593a7a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/tables/shelves_results.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/tables/shelves_results.tt >@@ -13,6 +13,8 @@ > "<a href='/cgi-bin/koha/virtualshelves/shelves.pl?op=view&shelfnumber=[% data.shelfnumber %]'>[% data.shelfname | html%]</a>", > "dt_count": > "[% data.count %] item(s)", >+ "dt_is_shared": >+ "[% IF data.type == 2 %]Public[% ELSIF data.is_shared %]Shared[% ELSE %]Private[% END %]", > "dt_owner": > "<a href='/cgi-bin/koha/members/moremember.pl?borrowernumber=[% data.owner %]'>[% data.firstname %] [% data.surname %]</a>", > "dt_sortby": >-- >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 18980
:
65229
|
65230
|
65231
|
65232
|
65273
|
65274
|
65275
|
65276
|
65347
|
65348
|
65349
|
65350