SF.net SVN: ledger-smb:[5804] branches/1.3

[..hidden..]

Revision: 5804
          http://sourceforge.net/p/ledger-smb/code/5804
Author:   einhverfr
Date:     2013-05-16 10:06:36 +0000 (Thu, 16 May 2013)
Log Message:
-----------
Fixing bug 820

Modified Paths:
--------------
    branches/1.3/Changelog
    branches/1.3/sql/modules/Fixes.sql
    branches/1.3/sql/modules/Roles.sql

Modified: branches/1.3/Changelog
===================================================================
--- branches/1.3/Changelog	2013-05-16 10:05:24 UTC (rev 5803)
+++ branches/1.3/Changelog	2013-05-16 10:06:36 UTC (rev 5804)
@@ -7,6 +7,7 @@
 * Fixed Department dropdown ordering and selection (Chris T, 810)
 * Fixed Project dropdown ordering and selection (Chris T, 809)
 * Fixed UI inconsistency re: language dropdown (Chris T, 816)
+* Fixed grants to menus (which can cause problems for submenus (Chris T, 820)
 
 Changelog for 1.3.32
 * Fixed em-dash handling for pdfs (Chris T)

Modified: branches/1.3/sql/modules/Fixes.sql
===================================================================
--- branches/1.3/sql/modules/Fixes.sql	2013-05-16 10:05:24 UTC (rev 5803)
+++ branches/1.3/sql/modules/Fixes.sql	2013-05-16 10:06:36 UTC (rev 5804)
@@ -516,3 +516,10 @@
        < '{1,3,31}';
 
 COMMIT;
+
+BEGIN;
+delete from menu_attribute where node_id = 192 and attribute = 'menu';
+
+DELETE FROM menu_acl WHERE node_id = 60 AND exists (select 1 from menu_attribute where node_id = 60 and attribute = 'menu');
+
+COMMIT;

Modified: branches/1.3/sql/modules/Roles.sql
===================================================================
--- branches/1.3/sql/modules/Roles.sql	2013-05-16 10:05:24 UTC (rev 5803)
+++ branches/1.3/sql/modules/Roles.sql	2013-05-16 10:06:36 UTC (rev 5804)
@@ -989,8 +989,6 @@
 IN ROLE "lsmb_<?lsmb dbname ?>__orders_generate";
 
 INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (60, 'allow', 'lsmb_<?lsmb dbname ?>__orders_purchase_consolidate');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
 values (62, 'allow', 'lsmb_<?lsmb dbname ?>__orders_purchase_consolidate');
 
 
@@ -999,8 +997,6 @@
 IN ROLE "lsmb_<?lsmb dbname ?>__orders_generate";
 
 INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (60, 'allow', 'lsmb_<?lsmb dbname ?>__orders_sales_consolidate');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
 values (61, 'allow', 'lsmb_<?lsmb dbname ?>__orders_sales_consolidate');
 
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.