From b8b8a62efa315f16e92baab0188284bc6a253a3d Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Mon, 9 Dec 2013 18:40:33 +0100 Subject: [PATCH] Bug 10907: Optionally show the staff member's name who managed a suggestion in OPAC Content-Type: text/plain; charset=utf-8 The name of a staff member who managed a suggestion is shown in the the OPAC if the new system preference OpacSuggestionManagedBy is set to 'Show'. This is also the default. If the preference is set to 'Don't show' the staff members name is not displayed and the column 'Managed by' in the table of suggestions in the patron account is not displayed. To test: - Create a one or more suggestions - 'Manage' them by accecpting or rejecting - Go to your patron account and check that the staff member name is shown for your suggestions - Apply patch, run database update - Check the name is still shown - Switch the preference to 'Don't show' - Check the name is no longer shown and the table still displays correctly, but without the 'Managed by' column - Repeat those tests for both bootstrap and prog theme! Signed-off-by: Chris Cormack Works as advertised, the only little nitpick is you could just do [% IF Koha.Preference( 'OpacSuggestionManagedBy' ) %] However you are following the custom in that file already, so that's fine Signed-off-by: Marcel de Rooy --- installer/data/mysql/sysprefs.sql | 1 + installer/data/mysql/updatedatabase.pl | 9 +++++++++ .../prog/en/modules/admin/preferences/opac.pref | 6 ++++++ .../bootstrap/en/modules/opac-suggestions.tt | 4 +++- .../opac-tmpl/prog/en/modules/opac-suggestions.tt | 4 +++- 5 files changed, 22 insertions(+), 2 deletions(-) diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql index 0de3ac7..8c925e5 100644 --- a/installer/data/mysql/sysprefs.sql +++ b/installer/data/mysql/sysprefs.sql @@ -272,6 +272,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('OPACShowUnusedAuthorities','1','','Show authorities that are not being used in the OPAC.','YesNo'), ('opacsmallimage','','','Enter a complete URL to an image to replace the default Koha logo','free'), ('OpacStarRatings','all','disable|all|details',NULL,'Choice'), +('OpacSuggestionManagedBy',1,'','Show the name of the staff member who managed a suggestion in OPAC','YesNo'), ('OpacSuppression','0','','Turn ON the OPAC Suppression feature, requires further setup, ask your system administrator for details','YesNo'), ('OpacSuppressionByIPRange','','','Restrict the suppression to IP adresses outside of the IP range','free'), ('opacthemes','bootstrap','','Define the current theme for the OPAC interface.','Themes'), diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 80ab210..6efc4ae 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -7912,6 +7912,15 @@ if ( CheckVersion($DBversion) ) { SetVersion($DBversion); } +$DBversion = "3.15.00.XXX"; +if(CheckVersion($DBversion)) { + $dbh->do("INSERT INTO systempreferences ( variable, value, options, explanation, type ) VALUES + ('OpacSuggestionManagedBy',1,'','Show the name of the staff member who managed a suggestion in OPAC','YesNo');"); + print "Upgrade to $DBversion done (Bug 10907: Add OpacSuggestionManagedBy system preference)\n"; + SetVersion($DBversion); +} + + =head1 FUNCTIONS =head2 TableExists($table) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref index a75c7ef..1364ff1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref @@ -280,6 +280,12 @@ OPAC: homebranch: 'home library' holdingbranch: 'holding library' - "is the logged in user's library. The second tab will contain all other items." + - + - pref: OpacSuggestionManagedBy + choices: + yes: Show + no: Don't show + - "the name of the staff member who managed a suggestion in OPAC." Features: - - pref: opacuserlogin diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt index 0ba0412..fa89078 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt @@ -148,7 +148,7 @@ Summary Note [% IF Koha.Preference( 'OPACViewOthersSuggestions' ) == 1 %]Suggested for[% END %] - Managed by + [% IF Koha.Preference( 'OpacSuggestionManagedBy' ) == 1 %]Managed by[% END %] Status @@ -186,6 +186,7 @@ [% END %] [% END %] + [% IF Koha.Preference( 'OpacSuggestionManagedBy' ) == 1 %] [% IF ( suggestions_loo.surnamemanagedby ) %] Managed by: @@ -194,6 +195,7 @@ [% END %] [% END %] + [% END %] Status: [% IF ( suggestions_loo.ASKED ) %]Requested diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tt index 5e52d84..61de641 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tt @@ -177,7 +177,7 @@ Summary Note [% IF ( OPACViewOthersSuggestions ) %]Suggested for[% END %] - Managed by + [% IF Koha.Preference( 'OpacSuggestionManagedBy' ) == 1 %]Managed by[% END %] Status [% FOREACH suggestions_loo IN suggestions_loop %] @@ -203,9 +203,11 @@ [% IF ( OPACViewOthersSuggestions ) %] [% IF ( suggestions_loo.branchcodesuggestedby ) %][% suggestions_loo.branchcodesuggestedby %][% ELSE %] [% END %] [% END %] + [% IF Koha.Preference( 'OpacSuggestionManagedBy' ) == 1 %] [% IF ( suggestions_loo.surnamemanagedby ) %][% suggestions_loo.surnamemanagedby %][% IF ( suggestions_loo.firstnamemanagedby ) %],[% END %] [% suggestions_loo.firstnamemanagedby %][% ELSE %] [% END %] + [% END %] [% IF ( suggestions_loo.ASKED ) %]Requested [% ELSIF ( suggestions_loo.CHECKED ) %]Checked by the library -- 1.7.7.6