From 913246c0867ab88ffaeaad3d147c699ada62f309 Mon Sep 17 00:00:00 2001 From: Dan Marsden Date: Fri, 29 Nov 2013 14:43:47 +1300 Subject: [PATCH 1/4] add missing grade_items_history upgrade step --- locallib.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/locallib.php b/locallib.php index 4828047..b2e6552 100644 --- a/locallib.php +++ b/locallib.php @@ -1461,6 +1461,11 @@ function attforblock_upgrade() { WHERE itemmodule = ?"; $DB->execute($sql, array('attendance', 'attforblock')); + $sql = "UPDATE {grade_items_history} + SET itemmodule = 'attendance' + WHERE itemmodule = 'attforblock'"; + $DB->execute($sql); + // Now convert role capabilities to 'attendance' $sql = "UPDATE {role_capabilities} SET capability = REPLACE(capability, ?, ?) From 68c8ff6626f1e4b061582864d2e4231fb8679189 Mon Sep 17 00:00:00 2001 From: Dan Marsden Date: Fri, 29 Nov 2013 14:50:55 +1300 Subject: [PATCH 2/4] use cross-db update of capabilities --- locallib.php | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/locallib.php b/locallib.php index b2e6552..a645366 100644 --- a/locallib.php +++ b/locallib.php @@ -1466,12 +1466,27 @@ function attforblock_upgrade() { WHERE itemmodule = 'attforblock'"; $DB->execute($sql); - // Now convert role capabilities to 'attendance' - $sql = "UPDATE {role_capabilities} - SET capability = REPLACE(capability, ?, ?) - WHERE " . $DB->sql_like('capability', '?'); - $params = array("mod/attforblock:", "mod/attendance:", "mod/attforblock:%"); - $DB->execute($sql, $params); + /* + * The user's custom capabilities need to be preserved due to the module renaming. + * Capabilities with a modifierid = 0 value are installed by default. + * Only update the user's custom capabilities where modifierid is not zero. + */ + $sql = $DB->sql_like('capability', '?').' AND modifierid <> 0'; + $rs = $DB->get_recordset_select('role_capabilities', $sql, array('%mod/attforblock%')); + foreach ($rs as $cap) { + $renamedcapability = str_replace('mod/attforblock', 'mod/attendance', $cap->capability); + $exists = $DB->record_exists('role_capabilities', array('roleid' => $cap->roleid, 'capability' => $renamedcapability)); + if (!$exists) { + $DB->update_record('role_capabilities', array('id' => $cap->id, 'capability' => $renamedcapability)); + } + } + + // Delete old role capabilities. + $sql = $DB->sql_like('capability', '?'); + $DB->delete_records_select('role_capabilities', $sql, array('%mod/attforblock%')); + + // Delete old capabilities. + $DB->delete_records_select('capabilities', 'component = ?', array('mod_attforblock')); // Clear cache for courses with attendances. $attendances = $DB->get_recordset('attendance', array(), '', 'course'); From 6ef315d0943ec63d769105c6b3bc60217f25be29 Mon Sep 17 00:00:00 2001 From: Tim Gus Date: Thu, 28 Nov 2013 16:27:20 -0500 Subject: [PATCH 3/4] CONTRIB-4754 Added upgrade step to account for name change from "attforblock" to "attendance": - updated itemmodule field in the grade tables - updated role_capabilities table to preserve old capabilities - deleted old data from capabilities and role_capabilities tables --- db/upgrade.php | 40 +++++++++++++++++++++++++++++++++++++++- version.php | 2 +- 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/db/upgrade.php b/db/upgrade.php index 0e9336d..c00926f 100644 --- a/db/upgrade.php +++ b/db/upgrade.php @@ -34,6 +34,44 @@ function xmldb_attendance_upgrade($oldversion=0) { $result = true; - // UPGRADES from attforblock are only supported for sites that are running attforblock version 2012120700. + if ($oldversion < 2013082902) { + // Replace values that reference old module "attforblock" to "attendance". + $sql = "UPDATE {grade_items} + SET itemmodule = 'attendance' + WHERE itemmodule = 'attforblock'"; + + $DB->execute($sql); + + $sql = "UPDATE {grade_items_history} + SET itemmodule = 'attendance' + WHERE itemmodule = 'attforblock'"; + + $DB->execute($sql); + + /* + * The user's custom capabilities need to be preserved due to the module renaming. + * Capabilities with a modifierid = 0 value are installed by default. + * Only update the user's custom capabilities where modifierid is not zero. + */ + $sql = $DB->sql_like('capability', '?').' AND modifierid <> 0'; + $rs = $DB->get_recordset_select('role_capabilities', $sql, array('%mod/attforblock%')); + foreach ($rs as $cap) { + $renamedcapability = str_replace('mod/attforblock', 'mod/attendance', $cap->capability); + $exists = $DB->record_exists('role_capabilities', array('roleid' => $cap->roleid, 'capability' => $renamedcapability)); + if (!$exists) { + $DB->update_record('role_capabilities', array('id' => $cap->id, 'capability' => $renamedcapability)); + } + } + + // Delete old role capabilities. + $sql = $DB->sql_like('capability', '?'); + $DB->delete_records_select('role_capabilities', $sql, array('%mod/attforblock%')); + + // Delete old capabilities. + $DB->delete_records_select('capabilities', 'component = ?', array('mod_attforblock')); + + upgrade_plugin_savepoint($result, 2013082902, 'mod', 'attendance'); + } + return $result; } diff --git a/version.php b/version.php index 2a10679..1cfb89d 100644 --- a/version.php +++ b/version.php @@ -22,7 +22,7 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -$module->version = 2013082901; +$module->version = 2013082902; $module->requires = 2013040500; $module->release = '2.5.2'; $module->maturity = MATURITY_STABLE; From 8758c451606680c9af242728becf4a69f587c7f2 Mon Sep 17 00:00:00 2001 From: Dan Marsden Date: Fri, 29 Nov 2013 14:59:30 +1300 Subject: [PATCH 4/4] bump version to release to plugins db --- version.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.php b/version.php index 1cfb89d..bacd533 100644 --- a/version.php +++ b/version.php @@ -24,7 +24,7 @@ $module->version = 2013082902; $module->requires = 2013040500; -$module->release = '2.5.2'; +$module->release = '2.5.3'; $module->maturity = MATURITY_STABLE; $module->cron = 0; $module->component = 'mod_attendance';