Bugzilla – Attachment 101547 Details for
Bug 13881
Add ability to defined circulation desks
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 13881: (QA follow-up) Some documentation and terminology fixes
Bug-13881-QA-follow-up-Some-documentation-and-term.patch (text/plain), 5.86 KB, created by
Katrin Fischer
on 2020-03-24 11:36:24 UTC
(
hide
)
Description:
Bug 13881: (QA follow-up) Some documentation and terminology fixes
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2020-03-24 11:36:24 UTC
Size:
5.86 KB
patch
obsolete
>From bf934786eeb77d1e0580a1a7d27ab0b4dd3f6364 Mon Sep 17 00:00:00 2001 >From: Katrin Fischer <katrin.fischer.83@web.de> >Date: Tue, 24 Mar 2020 11:24:52 +0000 >Subject: [PATCH] Bug 13881: (QA follow-up) Some documentation and terminology > fixes > >- Branchcode = Library >- Desk id = Desk ID >- Show library name on desk list and when deleting desk instead of code >- Some small changes to the database documentation. > >Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> >--- > .../data/mysql/atomicupdate/bug_13881_create_desks_table.perl | 4 ++-- > installer/data/mysql/kohastructure.sql | 4 ++-- > koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt | 10 +++++----- > 4 files changed, 10 insertions(+), 10 deletions(-) > >diff --git a/installer/data/mysql/atomicupdate/bug_13881_create_desks_table.perl b/installer/data/mysql/atomicupdate/bug_13881_create_desks_table.perl >index 21559f86a4..6228d21f51 100644 >--- a/installer/data/mysql/atomicupdate/bug_13881_create_desks_table.perl >+++ b/installer/data/mysql/atomicupdate/bug_13881_create_desks_table.perl >@@ -1,10 +1,10 @@ > $DBversion = 'XXX'; > if( CheckVersion( $DBversion ) ) { > $dbh->do(qq{ >- CREATE TABLE desks ( -- authorized values for desks available in a Library >+ CREATE TABLE desks ( -- desks available in a library > desk_id int(11) NOT NULL auto_increment, -- unique identifier added by Koha > desk_name varchar(100) NOT NULL default '', -- name of the desk >- branchcode varchar(10) NOT NULL, -- Library the desk is located into >+ branchcode varchar(10) NOT NULL, -- library the desk is located at > PRIMARY KEY (desk_id), > KEY `fk_desks_branchcode` (branchcode), > CONSTRAINT `fk_desks_branchcode` FOREIGN KEY (branchcode) REFERENCES branches (branchcode) ON DELETE CASCADE ON UPDATE CASCADE >diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql >index 66f0b28113..3e1dbc15af 100644 >--- a/installer/data/mysql/kohastructure.sql >+++ b/installer/data/mysql/kohastructure.sql >@@ -376,10 +376,10 @@ CREATE TABLE `cities` ( -- authorized values for cities/states/countries to choo > -- > > DROP TABLE IF EXISTS desks; >-CREATE TABLE desks ( -- authorized values for desks available in a Library >+CREATE TABLE desks ( -- desks available in a library > desk_id int(11) NOT NULL auto_increment, -- unique identifier > desk_name varchar(100) NOT NULL default '', -- name of the desk >- branchcode varchar(10) NOT NULL, -- Library the desk is located into >+ branchcode varchar(10) NOT NULL, -- library the desk is located at > PRIMARY KEY (desk_id), > KEY `fk_desks_branchcode` (branchcode), > CONSTRAINT `fk_desks_branchcode` FOREIGN KEY (branchcode) REFERENCES branches (branchcode) ON DELETE CASCADE ON UPDATE CASCADE >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt >index e23251629f..dc162f47df 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt >@@ -64,7 +64,7 @@ > <dt><a href="/cgi-bin/koha/admin/library_groups.pl">Library groups</a></dt> > <dd>Define hierarchical library groups.</dd> > <dt><a href="/cgi-bin/koha/admin/desks.pl">Desks</a></dt> >- <dd>Define desks.</dd> >+ <dd>Define desks</dd> > [% END %] > [% IF ( CAN_user_parameters_manage_itemtypes ) %] > <dt><a href="/cgi-bin/koha/admin/itemtypes.pl">Item types</a></dt> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt >index 6d356212b2..022968b7c6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt >@@ -33,7 +33,7 @@ > [% CASE 'error_on_update' %] > An error occurred when updating this desk. Perhaps it already exists. > [% CASE 'error_on_insert' %] >- An error occurred when adding this desk. The desk id might already exist. >+ An error occurred when adding this desk. The desk ID might already exist. > [% CASE 'error_on_delete' %] > An error occurred when deleting this desk. Check the logs. > [% CASE 'success_on_update' %] >@@ -98,14 +98,14 @@ > <div class="dialog alert"> > <h3>Delete desk "[% desk.desk_name | html %]?"</h3> > <table> >- <tr><th>Desk id</th> >+ <tr><th>Desk ID</th> > <td>[% desk.desk_id | html %]</td> > </tr> > <tr><th>Desk</th> > <td>[% desk.desk_name | html %]</td> > </tr> >- <tr><th>Branchcode</th> >- <td>[% desk.branchcode | html %]</td> >+ <tr><th>Library</th> >+ <td>[% Branches.GetName( desk.branchcode ) | html %]</td> > </tr> > </table> > <form action="/cgi-bin/koha/admin/desks.pl" method="post"> >@@ -145,7 +145,7 @@ > <tr> > <td>[% desk.desk_id | html %]</td> > <td>[% desk.desk_name | html %]</td> >- <td>[% desk.branchcode | html %]</td> >+ <td>[% Branches.GetName( desk.branchcode ) | html %]</td> > <td class="actions"> > <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/desks.pl?op=add_form&desk_id=[% desk.desk_id | html %]"><i class="fa fa-pencil"></i> Edit</a> > <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/desks.pl?op=delete_confirm&desk_id=[% desk.desk_id | html %]"><i class="fa fa-trash"></i> Delete</a> >-- >2.11.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 13881
:
37808
|
39837
|
40186
|
40569
|
40709
|
40895
|
41233
|
42804
|
43664
|
93445
|
93446
|
93447
|
93452
|
93453
|
93454
|
95287
|
95288
|
95289
|
95293
|
95294
|
95295
|
101033
|
101050
|
101064
|
101065
|
101479
|
101543
|
101544
|
101545
|
101546
| 101547 |
105009