Skip to content
Snippets Groups Projects
Commit c1596ee8 authored by Kurund Jalmi's avatar Kurund Jalmi
Browse files

Merge pull request #2227 from yashodha/4.4.CRM-13892 

CRM-13892 -added new column for dashboard
parents a1ade230 fa4916a4
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
CRM/Core/BAO/Dashboard.php
+ 11
− 0
View file @ c1596ee8
...@@ -357,6 +357,7 @@ class CRM_Core_BAO_Dashboard extends CRM_Core_DAO_Dashboard { ...@@ -357,6 +357,7 @@ class CRM_Core_BAO_Dashboard extends CRM_Core_DAO_Dashboard {
// check url is same as exiting entries, if yes just update existing // check url is same as exiting entries, if yes just update existing
$dashlet->url = CRM_Utils_Array::value('url', $params); $dashlet->url = CRM_Utils_Array::value('url', $params);
$dashlet->find(TRUE); $dashlet->find(TRUE);
$dashlet->name = self::getDashletName(CRM_Utils_Array::value('instanceURL', $params));
} }
else { else {
$dashlet->id = $dashboardID; $dashlet->id = $dashboardID;
...@@ -377,6 +378,16 @@ class CRM_Core_BAO_Dashboard extends CRM_Core_DAO_Dashboard { ...@@ -377,6 +378,16 @@ class CRM_Core_BAO_Dashboard extends CRM_Core_DAO_Dashboard {
return $dashlet; return $dashlet;
} }
static function getDashletName($url) {
$urlElements = explode('/', $url);
if ($urlElements[1] == 'dashlet') {
return $urlElements[2];
}
elseif ($urlElements[1] == 'report') {
return 'report/' . $urlElements[3];
}
return $url;
}
/** /**
* Update contact dashboard with new dashlet * Update contact dashboard with new dashlet
* *
......
CRM/Upgrade/Incremental/php/FourFour.php
+ 44
− 0
View file @ c1596ee8
...@@ -214,6 +214,50 @@ VALUES {$insertStatus}"; ...@@ -214,6 +214,50 @@ VALUES {$insertStatus}";
$this->addTask('Patch word-replacement schema', 'wordReplacements_patch', $rev); $this->addTask('Patch word-replacement schema', 'wordReplacements_patch', $rev);
} }
function upgrade_4_4_4($rev) {
// task to process sql
$this->addTask(ts('Upgrade DB to %1: SQL', array(1 => '4.4.4')), 'task_4_4_x_runSql', $rev);
// Consolidate activity contacts CRM-12274.
$this->addTask('Dashboard schema', 'dashboard');
return TRUE;
}
static function dashboard(CRM_Queue_TaskContext $ctx) {
$upgrade = new CRM_Upgrade_Form();
$query = "
ALTER TABLE civicrm_dashboard
ADD name varchar(64) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT 'Internal name of dashlet.' AFTER domain_id ";
CRM_Core_DAO::executeQuery($query);
$dashboard = new CRM_Core_DAO_Dashboard();
$dashboard->find();
while ($dashboard->fetch()) {
$urlElements = explode('/', $dashboard->url);
if ($urlElements[1] == 'dashlet') {
$url = explode('&', $urlElements[2]);
$name = $url[0];
}
elseif ($urlElements[1] == 'report') {
$url = explode('&', $urlElements[3]);
$name = 'report/' .$url[0];
}
$values .= "
WHEN {$dashboard->id} THEN '{$name}'
";
}
$query = "
UPDATE civicrm_dashboard
SET name = CASE id
{$values}
END;
";
CRM_Core_DAO::executeQuery($query);
}
/** /**
* Update activity contacts CRM-12274 * Update activity contacts CRM-12274
* *
......
xml/schema/Core/Dashboard.xml
+ 8
− 0
View file @ c1596ee8
...@@ -29,6 +29,14 @@ ...@@ -29,6 +29,14 @@
<key>id</key> <key>id</key>
<add>3.1</add> <add>3.1</add>
</foreignKey> </foreignKey>
<field>
<name>name</name>
<type>varchar</type>
<title>Dashlet Name</title>
<length>64</length>
<comment>Internal name of dashlet.</comment>
<add>4.4</add>
</field>
<field> <field>
<name>label</name> <name>label</name>
<type>varchar</type> <type>varchar</type>
......
xml/templates/civicrm_navigation.tpl
+ 6
− 6
View file @ c1596ee8
...@@ -96,13 +96,13 @@ INSERT INTO civicrm_mail_settings (domain_id, name, is_default, domain) VALUES ( ...@@ -96,13 +96,13 @@ INSERT INTO civicrm_mail_settings (domain_id, name, is_default, domain) VALUES (
-- activity and case dashlets -- activity and case dashlets
INSERT INTO `civicrm_dashboard` INSERT INTO `civicrm_dashboard`
( `domain_id`, `label`, `url`, `permission`, `permission_operator`, `column_no`, `is_minimized`, `is_active`, `weight`, `fullscreen_url`, `is_fullscreen`, `is_reserved`) ( `domain_id`, `name`, `label`, `url`, `permission`, `permission_operator`, `column_no`, `is_minimized`, `is_active`, `weight`, `fullscreen_url`, `is_fullscreen`, `is_reserved`)
VALUES VALUES
( @domainID, '{ts escape="sql"}CiviCRM News{/ts}', 'civicrm/dashlet/blog&reset=1&snippet=5', 'access CiviCRM', NULL, 0, 0, 1, 0, 'civicrm/dashlet/blog&reset=1&snippet=5&context=dashletFullscreen', 1, 1), ( @domainID, 'blog', '{ts escape="sql"}CiviCRM News{/ts}', 'civicrm/dashlet/blog&reset=1&snippet=5', 'access CiviCRM', NULL, 0, 0, 1, 0, 'civicrm/dashlet/blog&reset=1&snippet=5&context=dashletFullscreen', 1, 1),
( @domainID, '{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, '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, '{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, '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, '{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, '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, '{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 CiviCase', NULL , 0, 0, 1, 4, 'civicrm/dashlet/casedashboard&reset=1&snippet=5&context=dashletFullscreen', 1, 1);
-- event badge -- event badge
INSERT INTO civicrm_print_label (title, name, description, label_format_name, label_type_id, is_default, is_reserved, is_active, data) INSERT INTO civicrm_print_label (title, name, description, label_format_name, label_type_id, is_default, is_reserved, is_active, data)
......
xml/templates/civicrm_sample.tpl
+ 5
− 5
View file @ c1596ee8
...@@ -135,12 +135,12 @@ INSERT INTO `civicrm_contact_type` ...@@ -135,12 +135,12 @@ INSERT INTO `civicrm_contact_type`
-- Add sample dashlets -- Add sample dashlets
INSERT INTO `civicrm_dashboard` INSERT INTO `civicrm_dashboard`
( `domain_id`, `label`, `url`, `permission`, `permission_operator`, `column_no`, `is_minimized`, `is_active`, `weight`, `is_fullscreen`, `fullscreen_url`) ( `domain_id`, `name`, `label`, `url`, `permission`, `permission_operator`, `column_no`, `is_minimized`, `is_active`, `weight`, `is_fullscreen`, `fullscreen_url`)
VALUES VALUES
( @domain_id, '{ts escape="sql"}Donor Summary{/ts}' , 'civicrm/report/instance/6&reset=1&section=1&snippet=5&charts=barChart', 'access CiviContribute', 'AND', 0, 0,'1', 4, '1', 'civicrm/report/instance/6&reset=1&section=1&snippet=5&charts=barChart&context=dashletFullscreen'), ( @domain_id, 'report/6', '{ts escape="sql"}Donor Summary{/ts}' , 'civicrm/report/instance/6&reset=1&section=1&snippet=5&charts=barChart', 'access CiviContribute', 'AND', 0, 0,'1', 4, '1', 'civicrm/report/instance/6&reset=1&section=1&snippet=5&charts=barChart&context=dashletFullscreen'),
( @domain_id, '{ts escape="sql"}Top Donors{/ts}' , 'civicrm/report/instance/13&reset=1&section=2&snippet=5', 'access CiviContribute', 'AND', 0, 0,'1', 5, '1', 'civicrm/report/instance/13&reset=1&section=2&snippet=5&context=dashletFullscreen'), ( @domain_id, 'report/13', '{ts escape="sql"}Top Donors{/ts}' , 'civicrm/report/instance/13&reset=1&section=2&snippet=5', 'access CiviContribute', 'AND', 0, 0,'1', 5, '1', 'civicrm/report/instance/13&reset=1&section=2&snippet=5&context=dashletFullscreen'),
( @domain_id, '{ts escape="sql"}Event Income Summary{/ts}', 'civicrm/report/instance/25&reset=1&section=1&snippet=5&charts=pieChart', 'access CiviEvent' , 'AND', 0, 0,'1', 6, '1', 'civicrm/report/instance/25&reset=1&section=1&snippet=5&charts=pieChart&context=dashletFullscreen'), ( @domain_id, 'report/25', '{ts escape="sql"}Event Income Summary{/ts}', 'civicrm/report/instance/25&reset=1&section=1&snippet=5&charts=pieChart', 'access CiviEvent' , 'AND', 0, 0,'1', 6, '1', 'civicrm/report/instance/25&reset=1&section=1&snippet=5&charts=pieChart&context=dashletFullscreen'),
( @domain_id, '{ts escape="sql"}Membership Summary{/ts}' , 'civicrm/report/instance/20&reset=1&section=2&snippet=5', 'access CiviMember' , 'AND', 0, 0,'1', 7, '1', 'civicrm/report/instance/20&reset=1&section=2&snippet=5&context=dashletFullscreen'); ( @domain_id, 'report/20', '{ts escape="sql"}Membership Summary{/ts}' , 'civicrm/report/instance/20&reset=1&section=2&snippet=5', 'access CiviMember' , 'AND', 0, 0,'1', 7, '1', 'civicrm/report/instance/20&reset=1&section=2&snippet=5&context=dashletFullscreen');
-- INSERT sample data for membership -- INSERT sample data for membership
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment