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

(-)a/installer/data/mysql/atomicupdate/bug_16401.perl (+8 lines)
Line 0 Link Here
1
$DBversion = 'XXX';  # will be replaced by the RM
2
if( CheckVersion( $DBversion ) ) {
3
    $dbh->do( "UPDATE systempreferences SET value = CONCAT('http://', value) WHERE variable = 'staffClientBaseURL' AND value NOT LIKE 'http%'" );
4
5
    # Always end with this (adjust the bug info)
6
    SetVersion( $DBversion );
7
    print "Upgrade to $DBversion done (Bug 16401 - fix potentialy bad set staffClientBaseURL preference)\n";
8
}
(-)a/installer/data/mysql/sysprefs.sql (-1 / +1 lines)
Lines 494-500 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
494
('SpineLabelAutoPrint','0','','If this setting is turned on, a print dialog will automatically pop up for the quick spine label printer.','YesNo'),
494
('SpineLabelAutoPrint','0','','If this setting is turned on, a print dialog will automatically pop up for the quick spine label printer.','YesNo'),
495
('SpineLabelFormat','<itemcallnumber><copynumber>','30|10','This preference defines the format for the quick spine label printer. Just list the fields you would like to see in the order you would like to see them, surrounded by <>, for example <itemcallnumber>.','Textarea'),
495
('SpineLabelFormat','<itemcallnumber><copynumber>','30|10','This preference defines the format for the quick spine label printer. Just list the fields you would like to see in the order you would like to see them, surrounded by <>, for example <itemcallnumber>.','Textarea'),
496
('SpineLabelShowPrintOnBibDetails','0','','If turned on, a \"Print Label\" link will appear for each item on the bib details page in the staff interface.','YesNo'),
496
('SpineLabelShowPrintOnBibDetails','0','','If turned on, a \"Print Label\" link will appear for each item on the bib details page in the staff interface.','YesNo'),
497
('staffClientBaseURL','',NULL,'Specify the base URL of the staff client','free'),
497
('staffClientBaseURL','',NULL,'Specify the base URL of the staff client starting with http:// or https://. Do not include a trailing slash in the URL. (This must be filled in correctly for CAS, svc, and load_testing to work.)','free'),
498
('StaffDetailItemSelection', '1', NULL, 'Enable item selection in record detail page', 'YesNo'),
498
('StaffDetailItemSelection', '1', NULL, 'Enable item selection in record detail page', 'YesNo'),
499
('StaffSearchResultsDisplayBranch','holdingbranch','holdingbranch|homebranch','Controls the display of the home or holding branch for staff search results','Choice'),
499
('StaffSearchResultsDisplayBranch','holdingbranch','holdingbranch|homebranch','Controls the display of the home or holding branch for staff search results','Choice'),
500
('StaffSerialIssueDisplayCount','3','','Number of serial issues to display per subscription in the Staff client','Integer'),
500
('StaffSerialIssueDisplayCount','3','','Number of serial issues to display per subscription in the Staff client','Integer'),
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_client.pref (-2 / +2 lines)
Lines 6-15 Staff Client: Link Here
6
              choices: staff-templates
6
              choices: staff-templates
7
            - theme on the staff interface.
7
            - theme on the staff interface.
8
        -
8
        -
9
            - "The staff client is located at http://"
9
            - "The staff client is located at"
10
            - pref: staffClientBaseURL
10
            - pref: staffClientBaseURL
11
              class: url
11
              class: url
12
            - . Do not include a trailing slash in the URL.
12
            - This should be a complete URL, starting with http:// or https://. Do not include a trailing slash in the URL. (This must be filled in correctly for CAS, svc, and load_testing to work.)
13
        -
13
        -
14
            - Use the CSS stylesheet
14
            - Use the CSS stylesheet
15
            - pref: intranetstylesheet
15
            - pref: intranetstylesheet
(-)a/svc/import_bib (-1 / +1 lines)
Lines 98-104 sub import_bib { Link Here
98
    $sth = $dbh->prepare("SELECT overlay_status FROM import_records WHERE import_record_id =?");
98
    $sth = $dbh->prepare("SELECT overlay_status FROM import_records WHERE import_record_id =?");
99
    $sth->execute($import_record_id);
99
    $sth->execute($import_record_id);
100
    my $match_status = $sth->fetchrow_arrayref->[0] || 'no_match';
100
    my $match_status = $sth->fetchrow_arrayref->[0] || 'no_match';
101
    my $url = 'http://'. C4::Context->preference('staffClientBaseURL') .'/cgi-bin/koha/catalogue/detail.pl?biblionumber='. $biblionumber;
101
    my $url = C4::Context->preference('staffClientBaseURL') .'/cgi-bin/koha/catalogue/detail.pl?biblionumber='. $biblionumber;
102
102
103
    $result->{'status'} = "ok";
103
    $result->{'status'} = "ok";
104
    $result->{'import_batch_id'} = $batch_id;
104
    $result->{'import_batch_id'} = $batch_id;
(-)a/t/db_dependent/Auth_with_cas.t (-1 / +1 lines)
Lines 41-47 $dbh->{ RaiseError } = 1; Link Here
41
41
42
C4::Context->disable_syspref_cache();
42
C4::Context->disable_syspref_cache();
43
t::lib::Mocks::mock_preference('OPACBaseURL','http://localhost');
43
t::lib::Mocks::mock_preference('OPACBaseURL','http://localhost');
44
t::lib::Mocks::mock_preference('staffClientBaseURL','localhost:8080');
44
t::lib::Mocks::mock_preference('staffClientBaseURL','http://localhost:8080');
45
45
46
my $opac_base_url = C4::Context->preference('OpacBaseURL');
46
my $opac_base_url = C4::Context->preference('OpacBaseURL');
47
my $staff_base_url = C4::Context->preference('staffClientBaseURL');
47
my $staff_base_url = C4::Context->preference('staffClientBaseURL');
(-)a/t/db_dependent/selenium/basic_workflow.t (-2 / +1 lines)
Lines 45-51 use MARC::Field; Link Here
45
my $dbh = C4::Context->dbh;
45
my $dbh = C4::Context->dbh;
46
my $login = 'koha';
46
my $login = 'koha';
47
my $password = 'koha';
47
my $password = 'koha';
48
my $base_url= ( $ENV{KOHA_INTRANET_URL} || 'http://'.C4::Context->preference("staffClientBaseURL") ) . "/cgi-bin/koha/";
48
my $base_url= ( $ENV{KOHA_INTRANET_URL} || C4::Context->preference("staffClientBaseURL") ) . "/cgi-bin/koha/";
49
49
50
50
51
my $number_of_biblios_to_insert = 3;
51
my $number_of_biblios_to_insert = 3;
52
- 

Return to bug 16401