Skip to content
Snippets Groups Projects
Commit e645d68f authored by pratik.joshi's avatar pratik.joshi
Browse files

Merge pull request #2323 from NileemaJadhav/CRM-14056

-- CRM-14056 Fix for Multi-lingual 4.4.4 upgrade fails due to dashboard upgrade
parents 21d51f5c 7bfaef22
No related branches found
No related tags found
No related merge requests found
...@@ -250,18 +250,11 @@ WHERE a.id IS NULL; ...@@ -250,18 +250,11 @@ WHERE a.id IS NULL;
// task to process sql // task to process sql
$this->addTask(ts('Upgrade DB to %1: SQL', array(1 => '4.4.4')), 'task_4_4_x_runSql', $rev); $this->addTask(ts('Upgrade DB to %1: SQL', array(1 => '4.4.4')), 'task_4_4_x_runSql', $rev);
// Consolidate activity contacts CRM-12274. // CRM-13892 : add `name` column to dashboard schema
$this->addTask('Dashboard schema', 'dashboard');
return TRUE;
}
static function dashboard(CRM_Queue_TaskContext $ctx) {
$upgrade = new CRM_Upgrade_Form();
$query = " $query = "
ALTER TABLE civicrm_dashboard ALTER TABLE civicrm_dashboard
ADD name varchar(64) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT 'Internal name of dashlet.' AFTER domain_id "; ADD name varchar(64) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT 'Internal name of dashlet.' AFTER domain_id ";
CRM_Core_DAO::executeQuery($query); CRM_Core_DAO::executeQuery($query, array(), TRUE, NULL, FALSE, FALSE);
$dashboard = new CRM_Core_DAO_Dashboard(); $dashboard = new CRM_Core_DAO_Dashboard();
$dashboard->find(); $dashboard->find();
...@@ -286,8 +279,8 @@ ALTER TABLE civicrm_dashboard ...@@ -286,8 +279,8 @@ ALTER TABLE civicrm_dashboard
{$values} {$values}
END; END;
"; ";
CRM_Core_DAO::executeQuery($query, array(), TRUE, NULL, FALSE, FALSE);
CRM_Core_DAO::executeQuery($query);
return TRUE; return TRUE;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment