Bugzilla – Attachment 65691 Details for
Bug 11317
Add a way to access files from the intranet
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 11317 - Follow-up - Fixing merge error and cosmetic changes
Bug-11317---Follow-up---Fixing-merge-error-and-cos.patch (text/plain), 3.65 KB, created by
Katrin Fischer
on 2017-08-08 20:51:48 UTC
(
hide
)
Description:
Bug 11317 - Follow-up - Fixing merge error and cosmetic changes
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2017-08-08 20:51:48 UTC
Size:
3.65 KB
patch
obsolete
>From 17969e74dbb3f0d266370677007e37e98d417e2d Mon Sep 17 00:00:00 2001 >From: Katrin Fischer <katrin.fischer.83@web.de> >Date: Tue, 8 Aug 2017 22:50:29 +0200 >Subject: [PATCH] Bug 11317 - Follow-up - Fixing merge error and cosmetic > changes > >- Fixed conflicts on reports-home.tt from adding/removing > the link before moving it to tools >- Slightly reworded second line on the tools page to be > a bit more verbose. >- Added entry to the tools-menu.inc. >--- > koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc | 3 +++ > .../intranet-tmpl/prog/en/modules/reports/reports-home.tt | 15 --------------- > .../intranet-tmpl/prog/en/modules/tools/tools-home.tt | 2 +- > 3 files changed, 4 insertions(+), 16 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc >index d7b40cf..2131f68 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc >@@ -125,4 +125,7 @@ > [% IF ( CAN_user_tools_upload_general_files ) %] > <li><a href="/cgi-bin/koha/tools/upload.pl">Upload any file</a></li> > [% END %] >+ [% IF ( CAN_user_tools_access_files ) %] >+ <li><a href="/cgi-bin/koha/tools/access_files.pl">Report/log files</a></li> >+ [% END %] > </ul></div></div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt >index fb30ab4..8690307 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt >@@ -60,7 +60,6 @@ > <li><a href="/cgi-bin/koha/reports/catalogue_out.pl">Items with no checkouts</a></li> > </ul> > >-<<<<<<< HEAD > <h2>Other</h2> > <ul> > <li><a href="/cgi-bin/koha/reports/itemslost.pl">Items lost</a></li> >@@ -69,21 +68,7 @@ > <li><a href="/cgi-bin/koha/reports/issues_avg_stats.pl">Average loan time</a></li> > <li><a href="http://schema.koha-community.org/" target="blank">Koha database schema</a></li> > <li><a href="http://wiki.koha-community.org/wiki/SQL_Reports_Library" target="blank">Koha reports library</a></li> >- <li><a href="/cgi-bin/koha/reports/report_files.pl">Report/log files</a></li> > </ul></div> >-======= >- <h2>Other</h2> >- <ul> >- <li><a href="/cgi-bin/koha/reports/itemslost.pl">Items lost</a></li> >- <li><a href="/cgi-bin/koha/reports/orders_by_fund.pl">Orders by fund</a></li> >- <li><a href="/cgi-bin/koha/reports/manager.pl?report_name=itemtypes">Catalog by item type</a></li> >- <li><a href="/cgi-bin/koha/reports/issues_avg_stats.pl">Average loan time</a></li> >- <li><a href="http://schema.koha-community.org/" target="blank">Koha database schema</a></li> >- <li><a href="http://wiki.koha-community.org/wiki/SQL_Reports_Library" target="blank">Koha reports library</a></li> >- <li><a href="/cgi-bin/koha/tools/access_files.pl">Report/log files</a></li> >- <!--<li><a href="/cgi-bin/koha/reports/stats.screen.pl">Till reconciliation</a></li> --> >- </ul></div> >->>>>>>> Bug 11317 - Update the link under reports > </div> > > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt >index 6aa69ed..da1884b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt >@@ -116,7 +116,7 @@ > > [% IF CAN_user_tools_access_files %] > <dt><a href="/cgi-bin/koha/tools/access_files.pl">Report/log files</a></dt> >- <dd>Report/log files</dd> >+ <dd>Access report or log files</dd> > [% END %] > > </dl> >-- >2.7.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 11317
:
23203
|
25387
|
27492
|
27579
|
27604
|
35938
|
35939
|
35940
|
36844
|
39783
|
39784
|
39785
|
39786
|
44859
|
44860
|
48629
|
48635
|
49941
|
49942
|
49943
|
49944
|
49945
|
49946
|
49947
|
50421
|
50424
|
50425
|
50440
|
53446
|
58220
|
58221
|
58222
|
58223
|
58224
|
58225
|
58226
|
62971
|
62972
|
62973
|
62974
|
62975
|
64088
|
64089
|
65691
|
65851
|
65855
|
65856
|
65857
|
65909
|
65910
|
65911
|
65912
|
65913
|
65914
|
65915
|
65918
|
66091
|
66092
|
66093
|
66094
|
66095
|
66096
|
66097
|
66098
|
66099
|
66100
|
72097
|
72309
|
72456
|
72457
|
72458
|
72459
|
72460
|
72461
|
72462
|
72463
|
72464
|
72465
|
74119
|
74379
|
74756
|
74911
|
74912
|
74916
|
74917
|
74918
|
74919
|
75019