/[smeserver]/rpms/e-smith-manager/sme8/e-smith-manager-2.2.0-display-admin-only-messages-only-for-server-manager.patch
ViewVC logotype

Contents of /rpms/e-smith-manager/sme8/e-smith-manager-2.2.0-display-admin-only-messages-only-for-server-manager.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph


Revision 1.1 - (show annotations) (download)
Sun Jan 31 11:36:15 2010 UTC (14 years, 9 months ago) by snetram
Branch: MAIN
CVS Tags: e-smith-manager-2_2_0-6_el5_sme, e-smith-manager-2_2_0-8_el5_sme, e-smith-manager-2_2_0-9_el5_sme, e-smith-manager-2_2_0-10_el5_sme, e-smith-manager-2_2_0-5_el5_sme, e-smith-manager-2_2_0-7_el5_sme
* Sun Jan 31 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-5.sme
- Only display error messages intended for admin in server-manager [SME: 5700]

1 diff -up e-smith-manager-2.2.0/root/etc/e-smith/templates/etc/e-smith/web/common/head.tmpl/30FrameSetup01.display-admin-only-messages-only-for-server-manager e-smith-manager-2.2.0/root/etc/e-smith/templates/etc/e-smith/web/common/head.tmpl/30FrameSetup01
2 --- e-smith-manager-2.2.0/root/etc/e-smith/templates/etc/e-smith/web/common/head.tmpl/30FrameSetup01.display-admin-only-messages-only-for-server-manager 2010-01-31 12:31:51.000000000 +0100
3 +++ e-smith-manager-2.2.0/root/etc/e-smith/templates/etc/e-smith/web/common/head.tmpl/30FrameSetup01 2010-01-31 12:33:42.000000000 +0100
4 @@ -25,16 +25,21 @@ EOF
5 EOF
6 \}
7
8 - $DB = esmith::ConfigDB->open();
9 - $OUT .= qq(<div class="sme-error"><h5>
10 - Warning: you have not yet changed the default system password.</h5></div>)
11 - unless ($DB->get('PasswordSet')->value eq "yes");
12 -
13 - $OUT .= qq(<div class="sme-error"><h5>
14 - Warning: a reconfigure and reboot is required before proceeding! Failure to do so now
15 - may leave your system in an unknown state!</h5></div>)
16 - if ($DB->get('bootstrap-console') and $DB->get('bootstrap-console')->prop('Run') eq 'yes') ||
17 - ($DB->get('UnsavedChanges') and $DB->get('UnsavedChanges')->value eq 'yes');
18 + if( $ENV\{REQUEST_URI\} =~ m/(server-manager)/) \{
19 +
20 + $DB = esmith::ConfigDB->open();
21 + $OUT .= qq(<div class="sme-error"><h5>
22 + Warning: you have not yet changed the default system password.</h5></div>)
23 + unless ($DB->get('PasswordSet')->value eq "yes");
24 +
25 + $OUT .= qq(<div class="sme-error"><h5>
26 + Warning: a reconfigure and reboot is required before proceeding! Failure to do so now
27 + may leave your system in an unknown state!</h5></div>)
28 + if ($DB->get('bootstrap-console') and $DB->get('bootstrap-console')->prop('Run') eq 'yes') ||
29 + ($DB->get('UnsavedChanges') and $DB->get('UnsavedChanges')->value eq 'yes');
30 +
31 + $OUT;
32 +
33 + \}
34
35 - $OUT;
36 \}

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed