Attachment #42251 for bug #14298

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




    }
}

# Sco Patron should not contain any other perms than circulate => self_checkout
if (  C4::Context->preference('WebBasedSelfCheck')
      and C4::Context->preference('AutoSelfCheckAllowed')
) {
    my $userid = C4::Context->preference('AutoSelfCheckID');
    my $all_permissions = C4::Auth::get_user_subpermissions( $userid );
    my ( $has_self_checkout_perm, $has_other_permissions );
    while ( my ( $module, $permissions ) = each %$all_permissions ) {
        if ( $module eq 'circulate' ) {
            while ( my ( $permission, $flag ) = each %$permissions ) {
                if ( $permission eq 'self_checkout' ) {
                    $has_self_checkout_perm = 1;
                } else {
                    $has_other_permissions = 1;
                }
            }
        } else {
            $has_other_permissions = 1;
        }
    }
    $template->param(
        AutoSelfCheckPatronDoesNotHaveSelfCheckPerm => not ( $has_self_checkout_perm ),
        AutoSelfCheckPatronHasTooManyPerm => $has_other_permissions,
    );


}

$template->param(
    kohaVersion   => $kohaVersion,
    osVersion     => $osVersion,





        <div id="sysinfo">
    [% IF warnPrefBiblioAddsAuthorities || warnPrefEasyAnalyticalRecords || warnPrefAnonymousPatron ||
          warnNoActiveCurrency || QueryParserError || warnIsRootUser || xml_config_warnings.size || AutoSelfCheckPatronDoesNotHaveSelfCheckPerm || AutoSelfCheckPatronHasTooManyPerm %]
        [% IF (warnIsRootUser) %]
            <h2>Warning regarding current user</h2>
            <p>You are logged in as the database administrative user. This is not recommended because some parts of Koha will not function as expected when using this account.</p>

        [% END %]

        [% IF warnPrefBiblioAddsAuthorities || warnPrefEasyAnalyticalRecords || warnPrefAnonymousPatron ||
              warnNoActiveCurrency || QueryParserError || AutoSelfCheckPatronDoesNotHaveSelfCheckPerm || AutoSelfCheckPatronHasTooManyPerm %]
            <h2>Warnings regarding the system configuration</h2>
            <table>
                <caption>Preferences and parameters</caption>

                        </td>
                    </tr>
                [% END %]
                [% IF AutoSelfCheckPatronDoesNotHaveSelfCheckPerm %]
                    <tr><th scope="row"><b>Warning</b> </th><td>
                    The patron used for the self checkout module at the OPAC does not have the circulate => self_checkout permission.
                    </td></tr>
                [% END %]
                [% IF AutoSelfCheckPatronHasTooManyPerm %]
                    <tr><th scope="row"><b>Warning</b> </th><td>
                    The patron used for the self checkout module at the OPAC has too many permissions. They should only have circulate => self_checkout.
                    </td></tr>
                [% END %]
            </table>
        [% END %]

- 

Return to bug 14298

Lines 213-218 if ( !defined C4::Context->config('use_zebra_facets') ) { Link Here

(-)a/about.pl (+28 lines)
213	}	213	}
214	}	214	}
215		215
		216	# Sco Patron should not contain any other perms than circulate => self_checkout
		217	if ( C4::Context->preference('WebBasedSelfCheck')
		218	and C4::Context->preference('AutoSelfCheckAllowed')
		219	) {
		220	my $userid = C4::Context->preference('AutoSelfCheckID');
		221	my $all_permissions = C4::Auth::get_user_subpermissions( $userid );
		222	my ( $has_self_checkout_perm, $has_other_permissions );
		223	while ( my ( $module, $permissions ) = each %$all_permissions ) {
		224	if ( $module eq 'circulate' ) {
		225	while ( my ( $permission, $flag ) = each %$permissions ) {
		226	if ( $permission eq 'self_checkout' ) {
		227	$has_self_checkout_perm = 1;
		228	} else {
		229	$has_other_permissions = 1;
		230	}
		231	}
		232	} else {
		233	$has_other_permissions = 1;
		234	}
		235	}
		236	$template->param(
		237	AutoSelfCheckPatronDoesNotHaveSelfCheckPerm => not ( $has_self_checkout_perm ),
		238	AutoSelfCheckPatronHasTooManyPerm => $has_other_permissions,
		239	);
		240
		241
		242	}
		243
216	$template->param(	244	$template->param(
217	kohaVersion => $kohaVersion,	245	kohaVersion => $kohaVersion,
218	osVersion => $osVersion,	246	osVersion => $osVersion,

Lines 101-107 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt (-3 / +12 lines)
101		101
102	<div id="sysinfo">	102	<div id="sysinfo">
103	[% IF warnPrefBiblioAddsAuthorities \|\| warnPrefEasyAnalyticalRecords \|\| warnPrefAnonymousPatron \|\|	103	[% IF warnPrefBiblioAddsAuthorities \|\| warnPrefEasyAnalyticalRecords \|\| warnPrefAnonymousPatron \|\|
104	warnNoActiveCurrency \|\| QueryParserError \|\| warnIsRootUser \|\| xml_config_warnings.size %]	104	warnNoActiveCurrency \|\| QueryParserError \|\| warnIsRootUser \|\| xml_config_warnings.size \|\| AutoSelfCheckPatronDoesNotHaveSelfCheckPerm \|\| AutoSelfCheckPatronHasTooManyPerm %]
105	[% IF (warnIsRootUser) %]	105	[% IF (warnIsRootUser) %]
106	<h2>Warning regarding current user</h2>	106	<h2>Warning regarding current user</h2>
107	<p>You are logged in as the database administrative user. This is not recommended because some parts of Koha will not function as expected when using this account.</p>	107	<p>You are logged in as the database administrative user. This is not recommended because some parts of Koha will not function as expected when using this account.</p>
Lines 109-115 Link Here
109	[% END %]	109	[% END %]
110		110
111	[% IF warnPrefBiblioAddsAuthorities \|\| warnPrefEasyAnalyticalRecords \|\| warnPrefAnonymousPatron \|\|	111	[% IF warnPrefBiblioAddsAuthorities \|\| warnPrefEasyAnalyticalRecords \|\| warnPrefAnonymousPatron \|\|
112	warnNoActiveCurrency \|\| QueryParserError %]	112	warnNoActiveCurrency \|\| QueryParserError \|\| AutoSelfCheckPatronDoesNotHaveSelfCheckPerm \|\| AutoSelfCheckPatronHasTooManyPerm %]
113	<h2>Warnings regarding the system configuration</h2>	113	<h2>Warnings regarding the system configuration</h2>
114	<table>	114	<table>
115	<caption>Preferences and parameters</caption>	115	<caption>Preferences and parameters</caption>
Lines 137-142 Link Here
137	</td>	137	</td>
138	</tr>	138	</tr>
139	[% END %]	139	[% END %]
		140	[% IF AutoSelfCheckPatronDoesNotHaveSelfCheckPerm %]
		141	<tr><th scope="row"><b>Warning</b> </th><td>
		142	The patron used for the self checkout module at the OPAC does not have the circulate => self_checkout permission.
		143	</td></tr>
		144	[% END %]
		145	[% IF AutoSelfCheckPatronHasTooManyPerm %]
		146	<tr><th scope="row"><b>Warning</b> </th><td>
		147	The patron used for the self checkout module at the OPAC has too many permissions. They should only have circulate => self_checkout.
		148	</td></tr>
		149	[% END %]
140	</table>	150	</table>
141	[% END %]	151	[% END %]
142		152
143	-