[freeside-commits] branch FREESIDE_3_BRANCH updated. c5c8669beae1c3d377fce51bdcbf917994f66175

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


The branch, FREESIDE_3_BRANCH has been updated
       via  c5c8669beae1c3d377fce51bdcbf917994f66175 (commit)
      from  d5f138a9521a7b30cd08c4b616b407304a3ebe95 (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 c5c8669beae1c3d377fce51bdcbf917994f66175
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Thu Jan 16 13:50:27 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 13f11fc..7729e06 100644
--- a/httemplate/elements/menu.html
+++ b/httemplate/elements/menu.html
@@ -734,11 +734,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