[freeside-commits] branch FREESIDE_2_3_BRANCH updated. c4acb5965a5062c7aa55fb02629b1b68e303ed8c

[Ivan]

The branch, FREESIDE_2_3_BRANCH has been updated
       via  c4acb5965a5062c7aa55fb02629b1b68e303ed8c (commit)
       via  ede040e300689a97188db22e09aab932c07517e1 (commit)
       via  4793b73ff10ccb3fa1e2e7eaa1cb21c87f101ae1 (commit)
      from  474eccf02c42772b719e44f4f149058cc7208ea7 (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 c4acb5965a5062c7aa55fb02629b1b68e303ed8c
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon Dec 9 15:06:30 2013 -0800

    fix config menu access for message templates without Configuration, RT#25994

diff --git a/httemplate/elements/menu.html b/httemplate/elements/menu.html
index 81aff3d..8e369f4 100644
--- a/httemplate/elements/menu.html
+++ b/httemplate/elements/menu.html
@@ -707,7 +707,11 @@ $menu{'Configuration'} = [ \%config_menu, 'Configuration and setup' ]
   || $curuser->access_right('Broadband configuration')
   || $curuser->access_right('Phone configuration')
   || $curuser->access_right('Edit advertising sources')
-  || $curuser->access_right('Edit global advertising sources');
+  || $curuser->access_right('Edit global advertising sources')
+  || $curuser->access_right('View templates')
+  || $curuser->access_right('View global templates')
+  || $curuser->access_right('Edit templates')
+  || $curuser->access_right('Edit global templates');
 $menu{'Help'} = [ \%help_menu, '' ];
 
 

commit ede040e300689a97188db22e09aab932c07517e1
Merge: 4793b73 474eccf
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon Dec 9 15:04:15 2013 -0800

    Merge branch 'FREESIDE_2_3_BRANCH' of git.freeside.biz:/home/git/freeside into FREESIDE_2_3_BRANCH


commit 4793b73ff10ccb3fa1e2e7eaa1cb21c87f101ae1
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon Dec 9 14:52:25 2013 -0800

    doc links

diff --git a/httemplate/elements/menu.html b/httemplate/elements/menu.html
index 9b5478e..81aff3d 100644
--- a/httemplate/elements/menu.html
+++ b/httemplate/elements/menu.html
@@ -633,8 +633,8 @@ my $wiki = 'http://www.freeside.biz/mediawiki/index.php';
 my $doc_link = $conf->config('support-key')
                  ? "$wiki/Supported:Documentation"
                  : $curuser->access_right('Configuration')
-                   ? "$wiki/Freeside:2.1:Documentation"
-                   : "$wiki/Freeside:2.1:Documentation:User";
+                   ? "$wiki/Freeside:2.3:Documentation"
+                   : "$wiki/Freeside:2.1:Documentation:User"; #no page for other versions yet :/
 
 eval "use RT;"
   if $conf->config('ticket_system') eq 'RT_Internal';

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

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