From 3dfd48ba9c078f27cc96b6b54e298b9ae1004a1c Mon Sep 17 00:00:00 2001
From: Mark Nelson <markn@moodle.com>
Date: Wed, 18 Oct 2017 15:14:41 +0800
Subject: [PATCH] MDL-57455 mod_data: moved export tag checkbox and set default

Also capitalised string 'tags'.

AMOS BEGIN
 CPY [tags,core],[tags,mod_data]
AMOS END
---
 mod/data/export_form.php  |  8 ++++----
 mod/data/lang/en/data.php |  2 +-
 mod/data/lib.php          | 14 +++++++-------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/mod/data/export_form.php b/mod/data/export_form.php
index d100e8c4e58..edf9986165d 100644
--- a/mod/data/export_form.php
+++ b/mod/data/export_form.php
@@ -77,6 +77,10 @@ class mod_data_export_form extends moodleform {
         if ($numfieldsthatcanbeselected > 1) {
             $this->add_checkbox_controller(1, null, null, 1);
         }
+        if (core_tag_tag::is_enabled('mod_data', 'data_records')) {
+            $mform->addElement('checkbox', 'exporttags', get_string('includetags', 'data'));
+            $mform->setDefault('exporttags', 1);
+        }
         $context = context_module::instance($this->_cm->id);
         if (has_capability('mod/data:exportuserinfo', $context)) {
             $mform->addElement('checkbox', 'exportuser', get_string('includeuserdetails', 'data'));
@@ -86,10 +90,6 @@ class mod_data_export_form extends moodleform {
             $mform->addElement('checkbox', 'exportapproval', get_string('includeapproval', 'data'));
         }
 
-        if (core_tag_tag::is_enabled('mod_data', 'data_records')) {
-            $mform->addElement('checkbox', 'exporttags', get_string('includetags', 'data'));
-        }
-
         $this->add_action_buttons(true, get_string('exportentries', 'data'));
     }
 
diff --git a/mod/data/lang/en/data.php b/mod/data/lang/en/data.php
index 6e4d76f6360..4bfc52891ff 100644
--- a/mod/data/lang/en/data.php
+++ b/mod/data/lang/en/data.php
@@ -348,7 +348,7 @@ $string['subplugintype_datafield_plural'] = 'Database field types';
 $string['subplugintype_datapreset'] = 'Preset';
 $string['subplugintype_datapreset_plural'] = 'Presets';
 $string['tagarea_data_records'] = 'Data records';
-$string['tags'] = 'tags';
+$string['tags'] = 'Tags';
 $string['tagsdeleted'] = 'Database tags have been deleted';
 $string['teachersandstudents'] = '{$a->teachers} and {$a->students}';
 $string['templates'] = 'Templates';
diff --git a/mod/data/lib.php b/mod/data/lib.php
index 60d90f47ccd..3f469203fd0 100644
--- a/mod/data/lib.php
+++ b/mod/data/lib.php
@@ -3156,6 +3156,9 @@ function data_get_exportdata($dataid, $fields, $selectedfields, $currentgroup=0,
             $exportdata[0][] = $field->field->name;
         }
     }
+    if ($tags) {
+        $exportdata[0][] = get_string('tags', 'data');
+    }
     if ($userdetails) {
         $exportdata[0][] = get_string('user');
         $exportdata[0][] = get_string('username');
@@ -3168,9 +3171,6 @@ function data_get_exportdata($dataid, $fields, $selectedfields, $currentgroup=0,
     if ($approval) {
         $exportdata[0][] = get_string('approved', 'data');
     }
-    if ($tags) {
-        $exportdata[0][] = get_string('tags', 'data');
-    }
 
     $datarecords = $DB->get_records('data_records', array('dataid'=>$dataid));
     ksort($datarecords);
@@ -3193,6 +3193,10 @@ function data_get_exportdata($dataid, $fields, $selectedfields, $currentgroup=0,
                 }
                 $exportdata[$line][] = $contents;
             }
+            if ($tags) {
+                $itemtags = \core_tag_tag::get_item_tags_array('mod_data', 'data_records', $record->id);
+                $exportdata[$line][] = implode(', ', $itemtags);
+            }
             if ($userdetails) { // Add user details to the export data
                 $userdata = get_complete_user_data('id', $record->userid);
                 $exportdata[$line][] = fullname($userdata);
@@ -3206,10 +3210,6 @@ function data_get_exportdata($dataid, $fields, $selectedfields, $currentgroup=0,
             if ($approval) { // Add approval status
                 $exportdata[$line][] = (int) $record->approved;
             }
-            if ($tags) {
-                $itemtags = \core_tag_tag::get_item_tags_array('mod_data', 'data_records', $record->id);
-                $exportdata[$line][] = implode(', ', $itemtags);
-            }
         }
         $line++;
     }