[freeside-commits] freeside/httemplate/edit/process access_group.html, 1.5, 1.6 access_user.html, 1.8, 1.9 agent.cgi, 1.7, 1.8

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/httemplate/edit/process
In directory wavetail.420.am:/tmp/cvs-serv31008

Modified Files:
	access_group.html access_user.html agent.cgi 
Log Message:
webdemo UI

Index: access_user.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/process/access_user.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -w -d -r1.8 -r1.9
--- access_user.html	6 Jun 2010 06:24:22 -0000	1.8
+++ access_user.html	6 Jun 2010 06:29:36 -0000	1.9
@@ -1,6 +1,3 @@
-% if ( FS::Conf->new->exists('disable_acl_changes') ) {
-  ACL changes disabled in public demo.
-% } else {
 %  if ( $cgi->param('_password') ne $cgi->param('_password2') ) {
 %    $cgi->param('error', "The passwords do not match");
 %    print $cgi->redirect(popurl(2) . "access_user.html?" . $cgi->query_string);
@@ -16,10 +13,14 @@
              )
 %>
 %   }
-% }
 <%init>
 
 die "access denied"
   unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
 
+if ( FS::Conf->new->exists('disable_acl_changes') ) {
+  errorpage('ACL changes disabled in public demo.');
+  die "shouldn't be reached";
+}
+
 </%init>

Index: access_group.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/process/access_group.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -d -r1.5 -r1.6
--- access_group.html	18 May 2008 06:50:07 -0000	1.5
+++ access_group.html	6 Jun 2010 06:29:36 -0000	1.6
@@ -1,6 +1,3 @@
-% if ( $conf->exists('disable_acl_changes') ) {
-  ACL changes disabled in public demo.
-% } else {
 <% include( 'elements/process.html',
                'table'       => 'access_group',
                'viewall_dir' => 'browse',
@@ -17,12 +14,14 @@
                },
            )
 %>
-% }
 <%init>
 
 die "access denied"
   unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
 
-my $conf = new FS::Conf;
+if ( FS::Conf->new->exists('disable_acl_changes') ) {
+  errorpage('ACL changes disabled in public demo.');
+  die "shouldn't be reached";
+}
 
 </%init>

Index: agent.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/process/agent.cgi,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -d -r1.7 -r1.8
--- agent.cgi	13 Nov 2008 02:22:04 -0000	1.7
+++ agent.cgi	6 Jun 2010 06:29:36 -0000	1.8
@@ -13,4 +13,9 @@
 die "access denied"
   unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
 
+if ( FS::Conf->new->exists('disable_acl_changes') ) {
+  errorpage('ACL changes disabled in public demo.');
+  die "shouldn't be reached";
+}
+
 </%init>