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

(-)a/installer/data/mysql/atomicupdate/bug_13881_create_desks_table.perl (-2 / +2 lines)
Lines 1-10 Link Here
1
$DBversion = 'XXX';
1
$DBversion = 'XXX';
2
if( CheckVersion( $DBversion ) ) {
2
if( CheckVersion( $DBversion ) ) {
3
    $dbh->do(qq{
3
    $dbh->do(qq{
4
             CREATE TABLE desks ( -- authorized values for desks available in a Library
4
             CREATE TABLE desks ( -- desks available in a library
5
             desk_id int(11) NOT NULL auto_increment, -- unique identifier added by Koha
5
             desk_id int(11) NOT NULL auto_increment, -- unique identifier added by Koha
6
             desk_name varchar(100) NOT NULL default '', -- name of the desk
6
             desk_name varchar(100) NOT NULL default '', -- name of the desk
7
             branchcode varchar(10) NOT NULL,       -- Library the desk is located into
7
             branchcode varchar(10) NOT NULL,       -- library the desk is located at
8
             PRIMARY KEY  (desk_id),
8
             PRIMARY KEY  (desk_id),
9
             KEY `fk_desks_branchcode` (branchcode),
9
             KEY `fk_desks_branchcode` (branchcode),
10
             CONSTRAINT `fk_desks_branchcode` FOREIGN KEY (branchcode) REFERENCES branches (branchcode) ON DELETE CASCADE ON UPDATE CASCADE
10
             CONSTRAINT `fk_desks_branchcode` FOREIGN KEY (branchcode) REFERENCES branches (branchcode) ON DELETE CASCADE ON UPDATE CASCADE
(-)a/installer/data/mysql/kohastructure.sql (-2 / +2 lines)
Lines 376-385 CREATE TABLE `cities` ( -- authorized values for cities/states/countries to choo Link Here
376
--
376
--
377
377
378
DROP TABLE IF EXISTS desks;
378
DROP TABLE IF EXISTS desks;
379
CREATE TABLE desks ( -- authorized values for desks available in a Library
379
CREATE TABLE desks ( -- desks available in a library
380
  desk_id int(11) NOT NULL auto_increment, -- unique identifier
380
  desk_id int(11) NOT NULL auto_increment, -- unique identifier
381
  desk_name varchar(100) NOT NULL default '', -- name of the desk
381
  desk_name varchar(100) NOT NULL default '', -- name of the desk
382
  branchcode varchar(10) NOT NULL,       -- Library the desk is located into
382
  branchcode varchar(10) NOT NULL,       -- library the desk is located at
383
  PRIMARY KEY  (desk_id),
383
  PRIMARY KEY  (desk_id),
384
  KEY `fk_desks_branchcode` (branchcode),
384
  KEY `fk_desks_branchcode` (branchcode),
385
  CONSTRAINT `fk_desks_branchcode` FOREIGN KEY (branchcode) REFERENCES branches (branchcode) ON DELETE CASCADE ON UPDATE CASCADE
385
  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 (-1 / +1 lines)
Lines 64-70 Link Here
64
                        <dt><a href="/cgi-bin/koha/admin/library_groups.pl">Library groups</a></dt>
64
                        <dt><a href="/cgi-bin/koha/admin/library_groups.pl">Library groups</a></dt>
65
                        <dd>Define hierarchical library groups.</dd>
65
                        <dd>Define hierarchical library groups.</dd>
66
                        <dt><a href="/cgi-bin/koha/admin/desks.pl">Desks</a></dt>
66
                        <dt><a href="/cgi-bin/koha/admin/desks.pl">Desks</a></dt>
67
                        <dd>Define desks.</dd>
67
                        <dd>Define desks</dd>
68
                    [% END %]
68
                    [% END %]
69
                    [% IF ( CAN_user_parameters_manage_itemtypes ) %]
69
                    [% IF ( CAN_user_parameters_manage_itemtypes ) %]
70
                        <dt><a href="/cgi-bin/koha/admin/itemtypes.pl">Item types</a></dt>
70
                        <dt><a href="/cgi-bin/koha/admin/itemtypes.pl">Item types</a></dt>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt (-6 / +5 lines)
Lines 33-39 Link Here
33
        [% CASE 'error_on_update' %]
33
        [% CASE 'error_on_update' %]
34
            An error occurred when updating this desk. Perhaps it already exists.
34
            An error occurred when updating this desk. Perhaps it already exists.
35
        [% CASE 'error_on_insert' %]
35
        [% CASE 'error_on_insert' %]
36
            An error occurred when adding this desk. The desk id might already exist.
36
            An error occurred when adding this desk. The desk ID might already exist.
37
        [% CASE 'error_on_delete' %]
37
        [% CASE 'error_on_delete' %]
38
            An error occurred when deleting this desk. Check the logs.
38
            An error occurred when deleting this desk. Check the logs.
39
        [% CASE 'success_on_update' %]
39
        [% CASE 'success_on_update' %]
Lines 98-111 Link Here
98
    <div class="dialog alert">
98
    <div class="dialog alert">
99
        <h3>Delete desk "[% desk.desk_name | html %]?"</h3>
99
        <h3>Delete desk "[% desk.desk_name | html %]?"</h3>
100
        <table>
100
        <table>
101
            <tr><th>Desk id</th>
101
            <tr><th>Desk ID</th>
102
                <td>[% desk.desk_id | html %]</td>
102
                <td>[% desk.desk_id | html %]</td>
103
            </tr>
103
            </tr>
104
            <tr><th>Desk</th>
104
            <tr><th>Desk</th>
105
                <td>[% desk.desk_name | html %]</td>
105
                <td>[% desk.desk_name | html %]</td>
106
            </tr>
106
            </tr>
107
            <tr><th>Branchcode</th>
107
            <tr><th>Library</th>
108
                <td>[% desk.branchcode | html %]</td>
108
                <td>[% Branches.GetName( desk.branchcode ) | html %]</td>
109
            </tr>
109
            </tr>
110
        </table>
110
        </table>
111
        <form action="/cgi-bin/koha/admin/desks.pl" method="post">
111
        <form action="/cgi-bin/koha/admin/desks.pl" method="post">
Lines 145-151 Link Here
145
                <tr>
145
                <tr>
146
                    <td>[% desk.desk_id | html %]</td>
146
                    <td>[% desk.desk_id | html %]</td>
147
                    <td>[% desk.desk_name | html %]</td>
147
                    <td>[% desk.desk_name | html %]</td>
148
                    <td>[% desk.branchcode | html %]</td>
148
                    <td>[% Branches.GetName( desk.branchcode ) | html %]</td>
149
                    <td class="actions">
149
                    <td class="actions">
150
                        <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>
150
                        <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>
151
                        <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>
151
                        <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>
152
- 

Return to bug 13881