CRM-15211 fix outdated permission

diff --git a/sql/civicrm_generated.mysql b/sql/civicrm_generated.mysql
index b8a5da51e56ffc23a4f90ba94a87f30def2becd6..cb729bfead4c4e750d47db0e9c14361256ef664b 100644 (file)
--- a/sql/civicrm_generated.mysql
+++ b/sql/civicrm_generated.mysql
@@ -334,7 +334,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `civicrm_dashboard` WRITE;
 /*!40000 ALTER TABLE `civicrm_dashboard` DISABLE KEYS */;
-INSERT INTO `civicrm_dashboard` (`id`, `domain_id`, `name`, `label`, `url`, `permission`, `permission_operator`, `column_no`, `is_minimized`, `fullscreen_url`, `is_fullscreen`, `is_active`, `is_reserved`, `weight`) VALUES (1,1,'blog','CiviCRM News','civicrm/dashlet/blog?reset=1&snippet=5','access CiviCRM',NULL,0,0,'civicrm/dashlet/blog?reset=1&snippet=5&context=dashletFullscreen',1,1,1,0),(2,1,'activity','Activities','civicrm/dashlet/activity?reset=1&snippet=5','access CiviCRM',NULL,0,0,'civicrm/dashlet/activity?reset=1&snippet=5&context=dashletFullscreen',1,1,1,1),(3,1,'myCases','My Cases','civicrm/dashlet/myCases?reset=1&snippet=5','access my cases and activities',NULL,0,0,'civicrm/dashlet/myCases?reset=1&snippet=5&context=dashletFullscreen',1,1,1,2),(4,1,'allCases','All Cases','civicrm/dashlet/allCases?reset=1&snippet=5','access all cases and activities',NULL,0,0,'civicrm/dashlet/allCases?reset=1&snippet=5&context=dashletFullscreen',1,1,1,3),(5,1,'casedashboard','Case Dashboard Dashlet','civicrm/dashlet/casedashboard?reset=1&snippet=5','access CiviCase',NULL,0,0,'civicrm/dashlet/casedashboard?reset=1&snippet=5&context=dashletFullscreen',1,1,1,4),(6,1,'report/6','Donor Summary','civicrm/report/instance/6?reset=1&section=1&snippet=5&charts=barChart','access CiviContribute','AND',0,0,'civicrm/report/instance/6?reset=1&section=1&snippet=5&charts=barChart&context=dashletFullscreen',1,1,0,4),(7,1,'report/13','Top Donors','civicrm/report/instance/13?reset=1&section=2&snippet=5','access CiviContribute','AND',0,0,'civicrm/report/instance/13?reset=1&section=2&snippet=5&context=dashletFullscreen',1,1,0,5),(8,1,'report/25','Event Income Summary','civicrm/report/instance/25?reset=1&section=1&snippet=5&charts=pieChart','access CiviEvent','AND',0,0,'civicrm/report/instance/25?reset=1&section=1&snippet=5&charts=pieChart&context=dashletFullscreen',1,1,0,6),(9,1,'report/20','Membership Summary','civicrm/report/instance/20?reset=1&section=2&snippet=5','access CiviMember','AND',0,0,'civicrm/report/instance/20?reset=1&section=2&snippet=5&context=dashletFullscreen',1,1,0,7);
+INSERT INTO `civicrm_dashboard` (`id`, `domain_id`, `name`, `label`, `url`, `permission`, `permission_operator`, `column_no`, `is_minimized`, `fullscreen_url`, `is_fullscreen`, `is_active`, `is_reserved`, `weight`) VALUES (1,1,'blog','CiviCRM News','civicrm/dashlet/blog?reset=1&snippet=5','access CiviCRM',NULL,0,0,'civicrm/dashlet/blog?reset=1&snippet=5&context=dashletFullscreen',1,1,1,0),(2,1,'activity','Activities','civicrm/dashlet/activity?reset=1&snippet=5','access CiviCRM',NULL,0,0,'civicrm/dashlet/activity?reset=1&snippet=5&context=dashletFullscreen',1,1,1,1),(3,1,'myCases','My Cases','civicrm/dashlet/myCases?reset=1&snippet=5','access my cases and activities',NULL,0,0,'civicrm/dashlet/myCases?reset=1&snippet=5&context=dashletFullscreen',1,1,1,2),(4,1,'allCases','All Cases','civicrm/dashlet/allCases?reset=1&snippet=5','access all cases and activities',NULL,0,0,'civicrm/dashlet/allCases?reset=1&snippet=5&context=dashletFullscreen',1,1,1,3),(5,1,'casedashboard','Case Dashboard Dashlet','civicrm/dashlet/casedashboard?reset=1&snippet=5','access my cases and activities,access all cases and activities','OR',0,0,'civicrm/dashlet/casedashboard?reset=1&snippet=5&context=dashletFullscreen',1,1,1,4),(6,1,'report/6','Donor Summary','civicrm/report/instance/6?reset=1&section=1&snippet=5&charts=barChart','access CiviContribute','AND',0,0,'civicrm/report/instance/6?reset=1&section=1&snippet=5&charts=barChart&context=dashletFullscreen',1,1,0,4),(7,1,'report/13','Top Donors','civicrm/report/instance/13?reset=1&section=2&snippet=5','access CiviContribute','AND',0,0,'civicrm/report/instance/13?reset=1&section=2&snippet=5&context=dashletFullscreen',1,1,0,5),(8,1,'report/25','Event Income Summary','civicrm/report/instance/25?reset=1&section=1&snippet=5&charts=pieChart','access CiviEvent','AND',0,0,'civicrm/report/instance/25?reset=1&section=1&snippet=5&charts=pieChart&context=dashletFullscreen',1,1,0,6),(9,1,'report/20','Membership Summary','civicrm/report/instance/20?reset=1&section=2&snippet=5','access CiviMember','AND',0,0,'civicrm/report/instance/20?reset=1&section=2&snippet=5&context=dashletFullscreen',1,1,0,7);
 /*!40000 ALTER TABLE `civicrm_dashboard` ENABLE KEYS */;
 UNLOCK TABLES;
 

diff --git a/sql/test_data_second_domain.mysql b/sql/test_data_second_domain.mysql
index 483f3fe5ff3c98528fbbad2f409457920fcac5f0..cf7518804ea441d6c27b894b2e91e1ce2ac4f1f9 100644 (file)
--- a/sql/test_data_second_domain.mysql
+++ b/sql/test_data_second_domain.mysql
@@ -122,7 +122,7 @@ VALUES
     ( @domainID, 'Activities', 'civicrm/dashlet/activity&reset=1&snippet=5', 'access CiviCRM', NULL, 0, 0, 1, 1, 'civicrm/dashlet/activity&reset=1&snippet=5&context=dashletFullscreen', 1, 1),
     ( @domainID, 'My Cases', 'civicrm/dashlet/myCases&reset=1&snippet=5', 'access my cases and activities', NULL , 0, 0, 1, 2, 'civicrm/dashlet/myCases&reset=1&snippet=5&context=dashletFullscreen', 1, 1),
     ( @domainID, 'All Cases', 'civicrm/dashlet/allCases&reset=1&snippet=5', 'access all cases and activities', NULL , 0, 0, 1, 3, 'civicrm/dashlet/allCases&reset=1&snippet=5&context=dashletFullscreen', 1, 1),
-    ( @domainID, 'Case Dashboard Dashlet', 'civicrm/dashlet/casedashboard&reset=1&snippet=5', 'access CiviCase', NULL , 0, 0, 1, 4, 'civicrm/dashlet/casedashboard&reset=1&snippet=5&context=dashletFullscreen', 1, 1);
+    ( @domainID, 'Case Dashboard Dashlet', 'civicrm/dashlet/casedashboard&reset=1&snippet=5', 'access my cases and activities,access all cases and activities', 'OR' , 0, 0, 1, 4, 'civicrm/dashlet/casedashboard&reset=1&snippet=5&context=dashletFullscreen', 1, 1);
 
 -- navigation
 
@@ -1018,4 +1018,4 @@ VALUES
     ( @domainID, CONCAT('civicrm/report/instance/', @instanceID,'&reset=1'), 'Mailing Detail Report', 'Mailing Detail Report', 'administer CiviMail', 'OR', @reportlastID, '1', NULL, @instanceID+2 );
 UPDATE civicrm_report_instance SET navigation_id = LAST_INSERT_ID() WHERE id = @instanceID;
 UPDATE civicrm_domain SET version = '4.3.alpha1';
-  
\ No newline at end of file
+  

diff --git a/xml/templates/civicrm_navigation.tpl b/xml/templates/civicrm_navigation.tpl
index f70b99705faa1462adc13b5b7017f2c6eb9a218f..d3889e403292056fb0c95050a721401c906bcd0a 100644 (file)
--- a/xml/templates/civicrm_navigation.tpl
+++ b/xml/templates/civicrm_navigation.tpl
@@ -102,7 +102,7 @@ INSERT INTO `civicrm_dashboard`
     ( @domainID, 'activity', '{ts escape="sql"}Activities{/ts}', 'civicrm/dashlet/activity?reset=1&snippet=5', 'access CiviCRM', NULL, 0, 0, 1, 1, 'civicrm/dashlet/activity?reset=1&snippet=5&context=dashletFullscreen', 1, 1),
     ( @domainID, 'myCases', '{ts escape="sql"}My Cases{/ts}', 'civicrm/dashlet/myCases?reset=1&snippet=5', 'access my cases and activities', NULL , 0, 0, 1, 2, 'civicrm/dashlet/myCases?reset=1&snippet=5&context=dashletFullscreen', 1, 1),
     ( @domainID, 'allCases', '{ts escape="sql"}All Cases{/ts}', 'civicrm/dashlet/allCases?reset=1&snippet=5', 'access all cases and activities', NULL , 0, 0, 1, 3, 'civicrm/dashlet/allCases?reset=1&snippet=5&context=dashletFullscreen', 1, 1),
-    ( @domainID, 'casedashboard', '{ts escape="sql"}Case Dashboard Dashlet{/ts}', 'civicrm/dashlet/casedashboard?reset=1&snippet=5', 'access CiviCase', NULL , 0, 0, 1, 4, 'civicrm/dashlet/casedashboard?reset=1&snippet=5&context=dashletFullscreen', 1, 1);
+    ( @domainID, 'casedashboard', '{ts escape="sql"}Case Dashboard Dashlet{/ts}', 'civicrm/dashlet/casedashboard?reset=1&snippet=5', 'access my cases and activities,access all cases and activities', 'OR' , 0, 0, 1, 4, 'civicrm/dashlet/casedashboard?reset=1&snippet=5&context=dashletFullscreen', 1, 1);
 
 -- event badge
 INSERT INTO civicrm_print_label (title, name, description, label_format_name, label_type_id, is_default, is_reserved, is_active, data)