Merge branch 'MDL-62388_master' of git://github.com/dmonllao/moodle
authorJun Pataleta <jun@moodle.com>
Fri, 11 May 2018 02:03:44 +0000 (10:03 +0800)
committerJun Pataleta <jun@moodle.com>
Fri, 11 May 2018 02:03:44 +0000 (10:03 +0800)
admin/tool/dataprivacy/classes/api.php
admin/tool/dataprivacy/templates/purposes.mustache

index d1d6ef4..9054612 100644 (file)
@@ -478,6 +478,10 @@ class api {
     public static function update_purpose(stdClass $record) {
         self::check_can_manage_data_registry();
 
+        if (!isset($record->sensitivedatareasons)) {
+            $record->sensitivedatareasons = '';
+        }
+
         $purpose = new purpose($record->id);
         $purpose->from_record($record);
 
index ebdc10f..6e6c855 100644 (file)
@@ -67,7 +67,7 @@
     <table class="generaltable fullwidth">
         <caption class="accesshide">{{#str}}purposeslist, tool_dataprivacy{{/str}}</caption>
         <thead>
-            <tr style="display: flex;">
+            <tr>
                 <th scope="col" class="col-md-2">{{#str}}name{{/str}}</th>
                 <th scope="col" class="col-md-3">{{#str}}description{{/str}}</th>
                 <th scope="col" class="col-md-2">{{#str}}lawfulbases, tool_dataprivacy{{/str}}</th>