[freeside-commits] branch master updated. 863a22e44d49481109c956b0a0533b6672e3ca93

Ivan ivan at 420.am
Thu Jan 16 13:50:27 PST 2014


The branch, master has been updated
       via  863a22e44d49481109c956b0a0533b6672e3ca93 (commit)
      from  63d5cd3d1b5f7f7acf42eb9e0bb9c9c1f5d4dd47 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 863a22e44d49481109c956b0a0533b6672e3ca93
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Thu Jan 16 13:50:26 2014 -0800

    fix agent self-editing of templates without other config, RT#26766

diff --git a/httemplate/elements/menu.html b/httemplate/elements/menu.html
index 5225cce..99f5e11 100644
--- a/httemplate/elements/menu.html
+++ b/httemplate/elements/menu.html
@@ -766,11 +766,14 @@ $config_menu{'Network Monitoring'} = [ \%config_nms, '' ]
   if $curuser->access_right('Configure network monitoring')
   && $conf->config('network_monitoring_system') eq 'Torrus_Internal';
 
-if (   $curuser->access_right('Configuration' )
-     || $curuser->access_right('Edit advertising sources')
-     || $curuser->access_right('Edit global advertising sources')
+if ( $curuser->access_right([ 'Configuration',
+                              'View templates',
+                              'View global templates',
+                              'Edit templates',
+                              'Edit global templates',
+                           ])
    ) {
-  $config_menu{separator9} = '';
+  $config_menu{separator9} = '' if keys %config_menu;
   $config_menu{'Miscellaneous'} = [ \%config_misc, ''    ];
 }
 

-----------------------------------------------------------------------

Summary of changes:
 httemplate/elements/menu.html |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)




More information about the freeside-commits mailing list