Bugzilla – Attachment 161803 Details for
Bug 35972
Add a 'Research tables' feature, that builds upon Course reserves
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 35972: Tidy for QA scripts
Bug-35972-Tidy-for-QA-scripts.patch (text/plain), 4.06 KB, created by
Martin Renvoize (ashimema)
on 2024-02-07 13:46:11 UTC
(
hide
)
Description:
Bug 35972: Tidy for QA scripts
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2024-02-07 13:46:11 UTC
Size:
4.06 KB
patch
obsolete
>From 742eb4eccc36fdea5177eb3655b117cc853a2b37 Mon Sep 17 00:00:00 2001 >From: Martin Renvoize <martin.renvoize@ptfs-europe.com> >Date: Tue, 6 Feb 2024 14:37:46 +0000 >Subject: [PATCH] Bug 35972: Tidy for QA scripts > >--- > C4/CourseReserves.pm | 18 +++++++++--------- > .../bootstrap/en/includes/masthead.inc | 6 +++--- > opac/opac-thesis-table-details.pl | 7 ++++--- > opac/opac-thesis-tables.pl | 5 +++-- > 4 files changed, 19 insertions(+), 17 deletions(-) > >diff --git a/C4/CourseReserves.pm b/C4/CourseReserves.pm >index b9f33ba0c62..889f4708c19 100644 >--- a/C4/CourseReserves.pm >+++ b/C4/CourseReserves.pm >@@ -1013,7 +1013,7 @@ sub SearchCourses { > > my $term = $params{'term'}; > >- my $enabled = $params{'enabled'} || '%'; >+ my $enabled = $params{'enabled'} || '%'; > my $thesis_table = $params{'thesis_table'} || 'no'; > > my @params; >@@ -1046,15 +1046,15 @@ sub SearchCourses { > "; > > if ( $thesis_table eq 'no' ) { >- $query .= " >- AND >- c.department != 'TT' >- "; >+ $query .= " >+ AND >+ c.department != 'TT' >+ "; > } else { >- $query .= " >- AND >- c.department = 'TT' >- "; >+ $query .= " >+ AND >+ c.department = 'TT' >+ "; > } > > $query .= " >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc >index fecd7d2fe59..57199955ab2 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc >@@ -320,9 +320,9 @@ > <li class="nav-item"> > <a href="/cgi-bin/koha/opac-course-reserves.pl">Course reserves</a> > </li> >- <li class="nav-item"> >- <a href="/cgi-bin/koha/opac-thesis-tables.pl">Research tables</a> >- </li> >+ <li class="nav-item"> >+ <a href="/cgi-bin/koha/opac-thesis-tables.pl">Research tables</a> >+ </li> > [% END %] > [% IF Koha.Preference( 'OpacBrowser' ) == 1 %] > <li class="nav-item"> >diff --git a/opac/opac-thesis-table-details.pl b/opac/opac-thesis-table-details.pl >index fd82176d1c7..07b69c6e3ca 100755 >--- a/opac/opac-thesis-table-details.pl >+++ b/opac/opac-thesis-table-details.pl >@@ -22,7 +22,7 @@ use Modern::Perl; > > use CGI qw ( -utf8 ); > >-use C4::Auth qw( get_template_and_user ); >+use C4::Auth qw( get_template_and_user ); > use C4::Output qw( output_html_with_http_headers ); > use C4::Koha; > >@@ -31,7 +31,8 @@ use C4::CourseReserves qw(GetCourse GetCourseReserves); > my $cgi = CGI->new; > > my ( $template, $borrowernumber, $cookie ) = get_template_and_user( >- { template_name => "opac-thesis-table-details.tt", >+ { >+ template_name => "opac-thesis-table-details.tt", > query => $cgi, > type => "opac", > authnotrequired => 1, >@@ -43,7 +44,7 @@ my $table_id = $cgi->param('table_id'); > > die("No table_id given") unless ($table_id); > >-my $course = GetCourse($table_id); >+my $course = GetCourse($table_id); > my $course_reserves = GetCourseReserves( course_id => $table_id, include_items => 1, include_count => 1 ); > > $template->param( >diff --git a/opac/opac-thesis-tables.pl b/opac/opac-thesis-tables.pl >index 32321cd4c12..e9a044bd0f6 100755 >--- a/opac/opac-thesis-tables.pl >+++ b/opac/opac-thesis-tables.pl >@@ -22,7 +22,7 @@ use Modern::Perl; > > use CGI qw ( -utf8 ); > >-use C4::Auth qw( get_template_and_user ); >+use C4::Auth qw( get_template_and_user ); > use C4::Output qw( output_html_with_http_headers ); > > use C4::CourseReserves qw(SearchCourses); >@@ -30,7 +30,8 @@ use C4::CourseReserves qw(SearchCourses); > my $cgi = CGI->new; > > my ( $template, $borrowernumber, $cookie ) = get_template_and_user( >- { template_name => "opac-thesis-tables.tt", >+ { >+ template_name => "opac-thesis-tables.tt", > query => $cgi, > type => "opac", > authnotrequired => 1, >-- >2.43.0
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 35972
:
161714
|
161802
| 161803