@@ -, +, @@ 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. --- .../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(-) --- a/installer/data/mysql/atomicupdate/bug_13881_create_desks_table.perl +++ a/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 --- a/installer/data/mysql/kohastructure.sql +++ a/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 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt @@ -64,7 +64,7 @@
Desk id | +|
---|---|
Desk ID | [% desk.desk_id | html %] |
Desk | [% desk.desk_name | html %] |
Branchcode | -[% desk.branchcode | html %] | +
Library | +[% Branches.GetName( desk.branchcode ) | html %] |