Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions modules/data_release/jsx/manageFileForm.js
Original file line number Diff line number Diff line change
Expand Up @@ -192,10 +192,10 @@ class ManageFileForm extends Component {
label={t('Username', {ns: 'loris'})}
options={
this.state.fieldOptions.usersByFilePermissions[
this.state.specificReleaseI
this.state.specificReleaseId
]
}
onUserInput={(value) => {
onUserInput={(formElement, value) => {
this.setState({
selectedUserToRemove: value,
});
Expand Down
32 changes: 22 additions & 10 deletions modules/data_release/php/data_release.class.inc
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,14 @@ class Data_Release extends \DataFrameworkMenu

foreach ($result as $id => $row) {
$version = $row['version'] == null || $row['version'] == '' ?
'Unversioned' : $row['version'];
$result[$id] = $row['file_name'].' - '.$version;
'Unversioned' :
html_entity_decode($row['version'], ENT_QUOTES | ENT_HTML5, 'UTF-8');
$filename = html_entity_decode(
$row['file_name'],
ENT_QUOTES | ENT_HTML5,
'UTF-8'
);
$result[$id] = $filename.' - '.$version;
}

return $result;
Expand All @@ -118,9 +124,16 @@ class Data_Release extends \DataFrameworkMenu

$versionsList = [];
foreach ($versions as $version) {
$version = $version == null || $version == '' ?
'Unversioned' : $version;
$versionsList[$version] = $version;
if ($version === null || $version === '') {
$versionsList['Unversioned'] = 'Unversioned';
} else {
$versionsList[$version]
= html_entity_decode(
$version,
ENT_QUOTES | ENT_HTML5,
'UTF-8'
);
}
}

return $versionsList;
Expand Down Expand Up @@ -229,13 +242,12 @@ class Data_Release extends \DataFrameworkMenu
{
$result = $db->pselect(
"
SELECT LOWER(upr.userid) as userid, dr.id as data_release_id
SELECT dpr.userid as userid, dr.id as data_release_id
FROM data_release_permissions dpr
JOIN data_release dr ON dr.id = dpr.data_release_id
JOIN user_project_rel upr ON upr.ProjectID = dr.ProjectID
WHERE upr.UserID = :userID",
[':userID' => \User::singleton()->getID()],
'file_name'
WHERE dr.ProjectID IS NULL OR dr.ProjectID IN
(SELECT ProjectID FROM user_project_rel WHERE UserID = :userID)",
[':userID' => \User::singleton()->getID()]
);

$users = $this->getUsersList($db);
Expand Down
16 changes: 16 additions & 0 deletions modules/data_release/php/datareleaseprovisioner.class.inc
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,22 @@ class DataReleaseProvisioner extends \LORIS\Data\Provisioners\DBRowProvisioner
*/
public function getInstance($row) : \LORIS\Data\DataInstance
{
if (!empty($row['version'])) {
$row['version']
= html_entity_decode(
$row['version'],
ENT_QUOTES | ENT_HTML5,
'UTF-8'
);
}
if (!empty($row['fileName'])) {
$row['fileName']
= html_entity_decode(
$row['fileName'],
ENT_QUOTES | ENT_HTML5,
'UTF-8'
);
}
return new DataReleaseRow($row);
}
}
Loading