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

(-)a/Koha/Config.pm (-1 / +1 lines)
Lines 239-245 sub _read_from_dom_node { Link Here
239 
            delete $subconfig->{id};
 239 
            delete $subconfig->{id};
240 
        } else {
 240 
        } else {
241 
            my @keys = keys %$subconfig;
 241 
            my @keys = keys %$subconfig;
242 
            if (1 == scalar @keys && $keys[0] eq 'content') {
 242 
            if (!$node->hasAttributes() && 1 == scalar @keys && $keys[0] eq 'content') {
243 
                # An element with no attributes and no child elements becomes its text content
 243 
                # An element with no attributes and no child elements becomes its text content
244 
                $subconfig = $subconfig->{content};
 244 
                $subconfig = $subconfig->{content};
245 
            } elsif (0 == scalar @keys) {
 245 
            } elsif (0 == scalar @keys) {
(-)a/t/Koha/Config.t (+9 lines)
Lines 131-136 subtest 'read_from_file() tests' => sub { Link Here
131 
                }
 131 
                }
132 
            },
 132 
            },
133 
            'useshibboleth' => '0',
 133 
            'useshibboleth' => '0',
134 
            'shibboleth' => {
135 
                'autocreate' => '1',
136 
                'matchpoint' => 'userid',
137 
                'mapping' => {
138 
                    'userid' => { 'is' => 'uid' },
139 
                    'branchcode' => { 'content' => 'MAIN', 'is' => 'MAIN' },
140 
                    'categorycode' => { 'content' => 'STAFF' },
141 
                },
142 
            },
134 
            'zebra_lockdir' => '/home/koha/var/lock/zebradb',
 143 
            'zebra_lockdir' => '/home/koha/var/lock/zebradb',
135 
            'lockdir' => '__LOCK_DIR__',
 144 
            'lockdir' => '__LOCK_DIR__',
136 
            'use_zebra_facets' => '1',
 145 
            'use_zebra_facets' => '1',
(-)a/t/data/koha-conf.xml (-1 / +9 lines)
Lines 111-116 Link Here
111 
  </mapping>
 111 
  </mapping>
112 
 </ldapserver>
 112 
 </ldapserver>
113 
 <useshibboleth>0</useshibboleth><!-- see C4::Auth_with_shibboleth for extra configs you must do to turn this on -->
 113 
 <useshibboleth>0</useshibboleth><!-- see C4::Auth_with_shibboleth for extra configs you must do to turn this on -->
114 
 <shibboleth>
115 
  <autocreate>1</autocreate>
116 
  <matchpoint>userid</matchpoint> <!-- koha borrowers field to match against for authentication -->
117 
  <mapping>
118 
    <userid is="uid"></userid> <!-- mapping between koha borrowers field and shibboleth attribute name. AD FS should use eppn instead of uid. -->
119 
    <branchcode content="MAIN" is="MAIN"></branchcode>
120 
    <categorycode content="STAFF"></categorycode>
121 
  </mapping>
122 
 </shibboleth>
114 
 <zebra_lockdir>/home/koha/var/lock/zebradb</zebra_lockdir>
 123 
 <zebra_lockdir>/home/koha/var/lock/zebradb</zebra_lockdir>
115 
 <lockdir>__LOCK_DIR__</lockdir>
 124 
 <lockdir>__LOCK_DIR__</lockdir>
116 
 <use_zebra_facets>1</use_zebra_facets>
 125 
 <use_zebra_facets>1</use_zebra_facets>
117 
-

Return to bug 31393