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>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

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 21559f8..6228d21 100644 (file)
--- 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 75df8f6..124c583 100644 (file)
--- 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 e232516..dc162f4 100644 (file)
--- 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 6d35621..022968b 100644 (file)
--- 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&amp;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&amp;desk_id=[% desk.desk_id | html %]"><i class="fa fa-trash"></i> Delete</a>