From 2ddd7605d87a68848a770a0c543c8dfce1900b5b Mon Sep 17 00:00:00 2001 From: Mathew May Date: Wed, 15 May 2019 11:21:27 +0800 Subject: [PATCH] MDL-65606 mod_data: Add approvalstatusclass to template --- mod/data/db/upgrade.php | 17 +++++++++++++++++ mod/data/lib.php | 6 +++++- mod/data/version.php | 2 +- 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/mod/data/db/upgrade.php b/mod/data/db/upgrade.php index 0ecbeff5166..a38a100dedc 100644 --- a/mod/data/db/upgrade.php +++ b/mod/data/db/upgrade.php @@ -56,5 +56,22 @@ function xmldb_data_upgrade($oldversion) { // Automatically generated Moodle v3.7.0 release upgrade line. // Put any upgrade step following this. + if ($oldversion < 2019052001) { + + $columns = $DB->get_columns('data'); + + $oldclass = "mod-data-default-template ##approvalstatus##"; + $newclass = "mod-data-default-template ##approvalstatusclass##"; + + // Update existing classes. + $DB->replace_all_text('data', $columns['singletemplate'], $oldclass, $newclass); + $DB->replace_all_text('data', $columns['listtemplate'], $oldclass, $newclass); + $DB->replace_all_text('data', $columns['addtemplate'], $oldclass, $newclass); + $DB->replace_all_text('data', $columns['rsstemplate'], $oldclass, $newclass); + $DB->replace_all_text('data', $columns['asearchtemplate'], $oldclass, $newclass); + + // Data savepoint reached. + upgrade_mod_savepoint(true, 2019052001, 'data'); + } return true; } diff --git a/mod/data/lib.php b/mod/data/lib.php index 37519ceb2fd..9b3d93d8ff7 100644 --- a/mod/data/lib.php +++ b/mod/data/lib.php @@ -608,7 +608,7 @@ function data_generate_default_template(&$data, $template, $recordid=0, $form=fa if ($fields = $DB->get_records('data_fields', array('dataid'=>$data->id), 'id')) { $table = new html_table(); - $table->attributes['class'] = 'mod-data-default-template ##approvalstatus##'; + $table->attributes['class'] = 'mod-data-default-template ##approvalstatusclass##'; $table->colclasses = array('template-field', 'template-token'); $table->data = array(); foreach ($fields as $field) { @@ -1507,12 +1507,16 @@ function data_print_template($template, $records, $data, $search='', $page=0, $r } $patterns[] = '##approvalstatus##'; + $patterns[] = '##approvalstatusclass##'; if (!$data->approval) { $replacement[] = ''; + $replacement[] = ''; } else if ($record->approved) { $replacement[] = get_string('approved', 'data'); + $replacement[] = 'approved'; } else { $replacement[] = get_string('notapproved', 'data'); + $replacement[] = 'notapproved'; } $patterns[]='##comments##'; diff --git a/mod/data/version.php b/mod/data/version.php index d3bcc4f12cb..d2b5d3febf6 100644 --- a/mod/data/version.php +++ b/mod/data/version.php @@ -24,7 +24,7 @@ defined('MOODLE_INTERNAL') || die(); -$plugin->version = 2019052000; // The current module version (Date: YYYYMMDDXX) +$plugin->version = 2019052001; // The current module version (Date: YYYYMMDDXX) $plugin->requires = 2019051100; // Requires this Moodle version $plugin->component = 'mod_data'; // Full name of the plugin (used for diagnostics) $plugin->cron = 0; -- 2.43.0