Unverified Commit 5887342c authored by Jerome Boucher's avatar Jerome Boucher
Browse files

Merge branch 'develop' of gitlab-maarch@labs.maarch.org:maarch/maarchRM.git;...

Merge branch 'develop' of gitlab-maarch@labs.maarch.org:maarch/maarchRM.git; branch 'develop' of labs.maarch.org:maarch/maarchRM into develop
parents f836ddf3 946f9b10
Pipeline #6923 failed with stages
......@@ -335,7 +335,7 @@ class serviceAccount
$servicePosition = $this->servicePositionController->getPosition($serviceAccount->accountId);
if (isset($servicePosition->organization)) {
$this->organizationController->deleteServicePosition($orgId, $serviceAccount->accountId);
$this->organizationController->deleteServicePosition($servicePosition->orgId, $serviceAccount->accountId);
}
$this->organizationController->addServicePosition($orgId, $serviceAccount->accountId);
}
......
......@@ -378,7 +378,7 @@ class archive
$canDeleteResource = $canAddResource = false ;
if (($currentService->registrationNumber == $archive->archiverOrgRegNumber || in_array("owner", $currentService->orgRoleCodes))
if (($currentService->registrationNumber == $archive->archiverOrgRegNumber || ($currentService->orgRoleCodes && in_array("owner", $currentService->orgRoleCodes)))
&& \laabs::callService('auth/userAccount/readHasprivilege', "archiveManagement/addResource")
&& $archive->status === 'preserved') {
$canDeleteResource = $canAddResource = true ;
......
......@@ -1871,3 +1871,39 @@ msgstr "Coffre fort numérique : Valider l'intégrité d'un objet numérique"
msgid "digitalSafe/digitalSafe/create_originatorOwnerOrgRegNumber__originatorOrgRegNumber_"
msgstr "Coffre fort numérique : Création d'un objet numérique"
msgid "auth/serviceAccount/readExport"
msgstr "Export du référentiel de compte de service"
msgid "auth/userAccount/readExport"
msgstr "Export du référentiel utilisateur"
msgid "organization/organization/readExport"
msgstr "Export du référentiel d'organisation"
msgid "recordsManagement/archivalProfile/readExport"
msgstr "Export du référentiel de profil d'archive"
msgid "recordsManagement/descriptionField/readExport"
msgstr "Export du référentiel de champ de description"
msgid "recordsManagement/retentionRule/readExport"
msgstr "Export du référentiel de règle de conservation"
msgid "auth/serviceAccount/createImport"
msgstr "Import du référentiel de compte de service"
msgid "organization/organization/createImport"
msgstr "Import du référentiel d'organisation"
msgid "auth/userAccount/createImport"
msgstr "Import du référentiel utilisateur"
msgid "recordsManagement/archivalProfile/createImport"
msgstr "Import du référentiel de profil d'archive"
msgid "recordsManagement/descriptionField/createImport"
msgstr "Import du référentiel de champ de description"
msgid "recordsManagement/retentionRule/createImport"
msgstr "Import du référentiel de règle de conservation"
......@@ -55,6 +55,9 @@
<dt>Tax identifier</dt>
<dd id="orgInfo_taxIdentifier"></dd>
<dt>Enabled</dt>
<dd id="orgInfo_enabled"></dd>
</dl>
</div>
<?merge adminOrg.not().then('hide') @class ?>
......@@ -121,7 +124,14 @@
$('#orgInfo_displayName').text(organization.displayName);
$('#informationTab').find('dt, dd').css('display', 'none');
$.each(organization, function(key, value) {
if (value !=null) {
if (key === 'enabled' && isOrgUnit === true) {
if (value) {
content = '<i class="fa fa-check"></i>';
} else {
content = '<i class="fa fa-ban"></i>';
}
$('#orgInfo_' + key).css('display', '').html(content).prev().css('display', '');
}else if (value !=null && key !== 'enabled') {
$('#orgInfo_' + key).css('display', '').text(value).prev().css('display', '');
}
});
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment