Attachment #102323 for bug #4461

View | Details | Raw Unified | Return to bug 4461
Collapse All | Expand All

Lines 151-156 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc (+3 lines)
151	[% IF ( Koha.Preference('EnableAdvancedCatalogingEditor') && CAN_user_parameters_manage_keyboard_shortcuts ) %]	151	[% IF ( Koha.Preference('EnableAdvancedCatalogingEditor') && CAN_user_parameters_manage_keyboard_shortcuts ) %]
152	<li><a href="/cgi-bin/koha/admin/adveditorshortcuts.pl">Keyboard shortcuts</a></li>	152	<li><a href="/cgi-bin/koha/admin/adveditorshortcuts.pl">Keyboard shortcuts</a></li>
153	[% END %]	153	[% END %]
		154	[% IF ( Koha.Preference('OPACReportProblem') && CAN_user_problem_reports ) %]
		155	<li><a href="/cgi-bin/koha/admin/problem-reports.pl">OPAC problem reports</a></li>
		156	[% END %]
154	</ul>	157	</ul>
155	[% END %]	158	[% END %]
156	</div>	159	</div>

Lines 238-243 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt (+4 lines)
238	<dt><a href="/cgi-bin/koha/admin/adveditorshortcuts.pl">Keyboard shortcuts</a></dt>	238	<dt><a href="/cgi-bin/koha/admin/adveditorshortcuts.pl">Keyboard shortcuts</a></dt>
239	<dd>Define which keys trigger actions in the advanced cataloging editor</dd>	239	<dd>Define which keys trigger actions in the advanced cataloging editor</dd>
240	[% END %]	240	[% END %]
		241	[% IF ( Koha.Preference('OPACReportProblem') && CAN_user_problem_reports ) %]
		242	<dt><a href="/cgi-bin/koha/admin/problem-reports.pl">OPAC problem reports</a></dt>
		243	<dd>Manage OPAC problem reports submitted by patrons</dd>
		244	[% END %]
241	</dl>	245	</dl>
242	[% END %]	246	[% END %]
243	</div>	247	</div>

Lines 134-140 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt (-1 / +8 lines)
134	<div class="row">	134	<div class="row">
135	<div class="col-sm-12">	135	<div class="col-sm-12">
136	[%# Following statement must be in one line for translatability %]	136	[%# Following statement must be in one line for translatability %]
137	[% IF ( ( CAN_user_tools_moderate_comments && pendingcomments ) \|\| ( CAN_user_tools_moderate_tags && pendingtags ) \|\| ( CAN_user_borrowers_edit_borrowers && pending_borrower_modifications ) \|\| ( CAN_user_acquisition && pendingsuggestions ) \|\| ( CAN_user_borrowers_edit_borrowers && pending_discharge_requests ) \|\| pending_article_requests) \|\| ( Koha.Preference('AllowCheckoutNotes') && CAN_user_circulate_manage_checkout_notes && pending_checkout_notes.count ) %]	137	[% IF ( CAN_user_tools_moderate_comments && pendingcomments ) \|\| ( CAN_user_tools_moderate_tags && pendingtags ) \|\| ( CAN_user_borrowers_edit_borrowers && pending_borrower_modifications ) \|\| ( CAN_user_acquisition && pendingsuggestions ) \|\| ( CAN_user_borrowers_edit_borrowers && pending_discharge_requests ) \|\| pending_article_requests \|\| ( Koha.Preference('AllowCheckoutNotes') && CAN_user_circulate_manage_checkout_notes && pending_checkout_notes.count ) \|\| ( Koha.Preference('OPACReportProblem') && CAN_user_problem_reports && pending_problem_reports ) %]
138	<div id="area-pending">	138	<div id="area-pending">
139	[% IF pending_article_requests %]	139	[% IF pending_article_requests %]
140	<div class="pending-info" id="article_requests_pending">	140	<div class="pending-info" id="article_requests_pending">
Lines 188-193 Link Here
188	</div>	188	</div>
189	[% END %]	189	[% END %]
190		190
		191	[% IF ( Koha.Preference('OPACReportProblem') && CAN_user_problem_reports && pending_problem_reports ) %]
		192	<div class="pending-info" id="problem_reports_pending">
		193	<a href="/cgi-bin/koha/admin/problem-reports.pl">OPAC problem reports pending</a>:
		194	<span class="pending-number-link">[% pending_problem_reports.count \| html %]</span>
		195	</div>
		196	[% END %]
		197
191	</div>	198	</div>
192		199
193	[% END %]	200	[% END %]




use Koha::Patron::Discharge;
use Koha::Reviews;
use Koha::ArticleRequests;
use Koha::ProblemReports;

my $query = new CGI;


        $branch ? ( 'me.branchcode' => $branch ) : (),
    }
)->count;
my $pending_problem_reports = Koha::ProblemReports->search({ status => 'N' });

$template->param(
    pendingcomments                => $pendingcomments,

    pending_borrower_modifications => $pending_borrower_modifications,
    pending_discharge_requests     => $pending_discharge_requests,
    pending_article_requests       => $pending_article_requests,
    pending_problem_reports        => $pending_problem_reports
);

output_html_with_http_headers $query, $cookie, $template->output;
- 

Return to bug 4461

Lines 31-36 use Koha::Patron::Modifications; Link Here

(-)a/mainpage.pl (-1 / +3 lines)
31	use Koha::Patron::Discharge;	31	use Koha::Patron::Discharge;
32	use Koha::Reviews;	32	use Koha::Reviews;
33	use Koha::ArticleRequests;	33	use Koha::ArticleRequests;
		34	use Koha::ProblemReports;
34		35
35	my $query = new CGI;	36	my $query = new CGI;
36		37
Lines 74-79 my $pending_article_requests = Koha::ArticleRequests->search_limited( Link Here
74	$branch ? ( 'me.branchcode' => $branch ) : (),	75	$branch ? ( 'me.branchcode' => $branch ) : (),
75	}	76	}
76	)->count;	77	)->count;
		78	my $pending_problem_reports = Koha::ProblemReports->search({ status => 'N' });
77		79
78	$template->param(	80	$template->param(
79	pendingcomments => $pendingcomments,	81	pendingcomments => $pendingcomments,
Lines 82-87 $template->param( Link Here
82	pending_borrower_modifications => $pending_borrower_modifications,	84	pending_borrower_modifications => $pending_borrower_modifications,
83	pending_discharge_requests => $pending_discharge_requests,	85	pending_discharge_requests => $pending_discharge_requests,
84	pending_article_requests => $pending_article_requests,	86	pending_article_requests => $pending_article_requests,
		87	pending_problem_reports => $pending_problem_reports
85	);	88	);
86		89
87	output_html_with_http_headers $query, $cookie, $template->output;	90	output_html_with_http_headers $query, $cookie, $template->output;
88	-