moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-11 20:06:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'wip-MDL-62391-35' of git://github.com/abgreeve/moodle into MOODLE_35_STABLE

Browse source
This commit is contained in:
Andrew Nicols 2018-06-20 09:40:16 +08:00
commit 74c35a9133
4 changed files with 63 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
admin/tool/dataprivacy/lang/en/tool_dataprivacy.php
View file

@ -193,6 +193,7 @@ $string['purposeupdated'] = 'Purpose updated';
$string['replyto'] = 'Reply to'; $string['replyto'] = 'Reply to';
$string['requestactions'] = 'Actions'; $string['requestactions'] = 'Actions';
$string['requestby'] = 'Requested by'; $string['requestby'] = 'Requested by';
$string['requestbydetail'] = 'Requested by:';
$string['requestcomments'] = 'Comments'; $string['requestcomments'] = 'Comments';
$string['requestcomments_help'] = 'This box enables you to enter any further details about your data request.'; $string['requestcomments_help'] = 'This box enables you to enter any further details about your data request.';
$string['requestemailintro'] = 'You have received a data request:'; $string['requestemailintro'] = 'You have received a data request:';

32
admin/tool/dataprivacy/templates/data_requests.mustache
View file

@ -41,7 +41,11 @@
"comments": "I would like to download all of my daughter's personal data", "comments": "I would like to download all of my daughter's personal data",
"statuslabelclass": "label-default", "statuslabelclass": "label-default",
"statuslabel": "Pending", "statuslabel": "Pending",
"timecreated" : 1517902435 "timecreated" : 1517902435,
"requestedbyuser" : {
"fullname": "Martha Smith",
"profileurl": "#"
}
}, },
{ {
"id": 2, "id": 2,
@ -53,7 +57,11 @@
"comments": "Please give me all of the information you have about me...", "comments": "Please give me all of the information you have about me...",
"statuslabelclass": "label-warning", "statuslabelclass": "label-warning",
"statuslabel": "Awaiting completion", "statuslabel": "Awaiting completion",
"timecreated" : 1517902435 "timecreated" : 1517902435,
"requestedbyuser" : {
"fullname": "Martha Smith",
"profileurl": "#"
}
}, },
{ {
"id": 3, "id": 3,
@ -65,7 +73,11 @@
"comments": "Please delete all of my son's personal data.", "comments": "Please delete all of my son's personal data.",
"statuslabelclass": "label-success", "statuslabelclass": "label-success",
"statuslabel": "Complete", "statuslabel": "Complete",
"timecreated" : 1517902435 "timecreated" : 1517902435,
"requestedbyuser" : {
"fullname": "Martha Smith",
"profileurl": "#"
}
}, },
{ {
"id": 4, "id": 4,
@ -77,7 +89,11 @@
"comments": "I would like to request for my personal data to be deleted from your site. Thanks!", "comments": "I would like to request for my personal data to be deleted from your site. Thanks!",
"statuslabelclass": "label-danger", "statuslabelclass": "label-danger",
"statuslabel": "Rejected", "statuslabel": "Rejected",
"timecreated" : 1517902435 "timecreated" : 1517902435,
"requestedbyuser" : {
"fullname": "Martha Smith",
"profileurl": "#"
}
}, },
{ {
"id": 5, "id": 5,
@ -89,7 +105,11 @@
"comments": "Please let me download my data", "comments": "Please let me download my data",
"statuslabelclass": "label-info", "statuslabelclass": "label-info",
"statuslabel": "Processing", "statuslabel": "Processing",
"timecreated" : 1517902435 "timecreated" : 1517902435,
"requestedbyuser" : {
"fullname": "Martha Smith",
"profileurl": "#"
}
} }
] ]
} }
@ -111,6 +131,7 @@
<th scope="col">{{#str}}requesttype, tool_dataprivacy{{/str}}</th> <th scope="col">{{#str}}requesttype, tool_dataprivacy{{/str}}</th>
<th scope="col">{{#str}}user, tool_dataprivacy{{/str}}</th> <th scope="col">{{#str}}user, tool_dataprivacy{{/str}}</th>
<th scope="col">{{#str}}daterequested, tool_dataprivacy{{/str}}</th> <th scope="col">{{#str}}daterequested, tool_dataprivacy{{/str}}</th>
<th scope="col">{{#str}}requestby, tool_dataprivacy{{/str}}</th>
<th scope="col">{{#str}}requeststatus, tool_dataprivacy{{/str}}</th> <th scope="col">{{#str}}requeststatus, tool_dataprivacy{{/str}}</th>
<th scope="col" colspan="2">{{#str}}message, tool_dataprivacy{{/str}}</th> <th scope="col" colspan="2">{{#str}}message, tool_dataprivacy{{/str}}</th>
</tr> </tr>
@ -126,6 +147,7 @@
<td>{{typenameshort}}</td> <td>{{typenameshort}}</td>
<td><a href="{{foruser.profileurl}}" title="{{#str}}viewprofile{{/str}}">{{foruser.fullname}}</a></td> <td><a href="{{foruser.profileurl}}" title="{{#str}}viewprofile{{/str}}">{{foruser.fullname}}</a></td>
<td>{{#userdate}} {{timecreated}}, {{#str}} strftimedatetime {{/str}} {{/userdate}}</td> <td>{{#userdate}} {{timecreated}}, {{#str}} strftimedatetime {{/str}} {{/userdate}}</td>
<td><a href="{{requestedbyuser.profileurl}}" title="{{#str}}viewprofile{{/str}}">{{requestedbyuser.fullname}}</a></td>
<td> <td>
<span class="label {{statuslabelclass}}">{{statuslabel}}</span> <span class="label {{statuslabelclass}}">{{statuslabel}}</span>
</td> </td>

32
admin/tool/dataprivacy/templates/my_data_requests.mustache
View file

@ -37,7 +37,11 @@
"comments": "I would like to download all of my daughter's personal data", "comments": "I would like to download all of my daughter's personal data",
"statuslabelclass": "label-default", "statuslabelclass": "label-default",
"statuslabel": "Pending", "statuslabel": "Pending",
"timecreated" : 1517902087 "timecreated" : 1517902087,
"requestedbyuser" : {
"fullname": "Martha Smith",
"profileurl": "#"
}
}, },
{ {
"id": 2, "id": 2,
@ -45,7 +49,11 @@
"comments": "Give me all of the information you have about me, or else...", "comments": "Give me all of the information you have about me, or else...",
"statuslabelclass": "label-warning", "statuslabelclass": "label-warning",
"statuslabel": "Awaiting completion", "statuslabel": "Awaiting completion",
"timecreated" : 1517902087 "timecreated" : 1517902087,
"requestedbyuser" : {
"fullname": "Martha Smith",
"profileurl": "#"
}
}, },
{ {
"id": 3, "id": 3,
@ -53,7 +61,11 @@
"comments": "Please delete all of my son's personal data.", "comments": "Please delete all of my son's personal data.",
"statuslabelclass": "label-success", "statuslabelclass": "label-success",
"statuslabel": "Complete", "statuslabel": "Complete",
"timecreated" : 1517902087 "timecreated" : 1517902087,
"requestedbyuser" : {
"fullname": "Martha Smith",
"profileurl": "#"
}
}, },
{ {
"id": 4, "id": 4,
@ -61,7 +73,11 @@
"comments": "Delete my data or I'm coming for you...", "comments": "Delete my data or I'm coming for you...",
"statuslabelclass": "label-danger", "statuslabelclass": "label-danger",
"statuslabel": "Rejected", "statuslabel": "Rejected",
"timecreated" : 1517902087 "timecreated" : 1517902087,
"requestedbyuser" : {
"fullname": "Martha Smith",
"profileurl": "#"
}
}, },
{ {
"id": 5, "id": 5,
@ -69,7 +85,11 @@
"comments": "Please let me download my data", "comments": "Please let me download my data",
"statuslabelclass": "label-info", "statuslabelclass": "label-info",
"statuslabel": "Processing", "statuslabel": "Processing",
"timecreated" : 1517902087 "timecreated" : 1517902087,
"requestedbyuser" : {
"fullname": "Martha Smith",
"profileurl": "#"
}
} }
] ]
} }
@ -90,6 +110,7 @@
<tr> <tr>
<th scope="col">{{#str}}requesttype, tool_dataprivacy{{/str}}</th> <th scope="col">{{#str}}requesttype, tool_dataprivacy{{/str}}</th>
<th scope="col">{{#str}}daterequested, tool_dataprivacy{{/str}}</th> <th scope="col">{{#str}}daterequested, tool_dataprivacy{{/str}}</th>
<th scope="col">{{#str}}requestby, tool_dataprivacy{{/str}}</th>
<th scope="col">{{#str}}requeststatus, tool_dataprivacy{{/str}}</th> <th scope="col">{{#str}}requeststatus, tool_dataprivacy{{/str}}</th>
<th scope="col" colspan="2">{{#str}}message, tool_dataprivacy{{/str}}</th> <th scope="col" colspan="2">{{#str}}message, tool_dataprivacy{{/str}}</th>
</tr> </tr>
@ -104,6 +125,7 @@
}}> }}>
<td>{{typename}}</td> <td>{{typename}}</td>
<td>{{#userdate}} {{timecreated}}, {{#str}} strftimedatetime {{/str}} {{/userdate}}</td> <td>{{#userdate}} {{timecreated}}, {{#str}} strftimedatetime {{/str}} {{/userdate}}</td>
<td><a href="{{requestedbyuser.profileurl}}" title="{{#str}}viewprofile{{/str}}">{{requestedbyuser.fullname}}</a></td>
<td> <td>
<span class="label {{statuslabelclass}}">{{statuslabel}}</span> <span class="label {{statuslabelclass}}">{{statuslabel}}</span>
</td> </td>

8
admin/tool/dataprivacy/templates/request_details.mustache
View file

@ -44,6 +44,10 @@
"canreview": true, "canreview": true,
"reviewurl": "#", "reviewurl": "#",
"timecreated": 1517561224, "timecreated": 1517561224,
"requestedbyuser" : {
"fullname": "Martha Smith",
"profileurl": "#"
},
"statuslabel": "Pending", "statuslabel": "Pending",
"statuslabelclass": "label-default", "statuslabelclass": "label-default",
"messagehtml": "<p>Hello,</p><p>I would like to download all of my personal data.</p><p>Thanks!</p>" "messagehtml": "<p>Hello,</p><p>I would like to download all of my personal data.</p><p>Thanks!</p>"
@ -69,6 +73,10 @@
<strong>{{#str}}statusdetail, tool_dataprivacy{{/str}}</strong> <strong>{{#str}}statusdetail, tool_dataprivacy{{/str}}</strong>
<span class="label {{statuslabelclass}}">{{statuslabel}}</span> <span class="label {{statuslabelclass}}">{{statuslabel}}</span>
</span> </span>
<span class="pull-left m-r-1">
<strong>{{#str}}requestbydetail, tool_dataprivacy{{/str}}</strong>
<span><a href="{{requestedbyuser.profileurl}}" title="{{#str}}viewprofile{{/str}}">{{requestedbyuser.fullname}}</a></span>
</span>
</div> </div>
{{#canreview}} {{#canreview}}
<!--a href="{{reviewurl}}" class="btn btn-default">{{#str}}reviewdata, tool_dataprivacy{{/str}}</a--> <!--a href="{{reviewurl}}" class="btn btn-default">{{#str}}reviewdata, tool_dataprivacy{{/str}}</a-->