diff --git a/src/bundle/organization/Controller/organization.php b/src/bundle/organization/Controller/organization.php index 03ce841a23fce4540a9fdfc789a626887d4c1e29..fb8c4017fe31cd7a408166c0f3b883bc15c0d6b7 100755 --- a/src/bundle/organization/Controller/organization.php +++ b/src/bundle/organization/Controller/organization.php @@ -1624,15 +1624,11 @@ class organization public function getOriginator() { $currentService = \laabs::getToken("ORGANIZATION"); - if (!$currentService) { - $this->view->addContentFile("recordsManagement/welcome/noWorkingOrg.html"); - - return $this->view->saveHtml(); - } + $ownerOriginatorOrgs = $this->getOwnerOrgsByRole($currentService, 'originator'); $originators = []; foreach ($ownerOriginatorOrgs as $org) { - foreach ($org->originator as $originator) { + foreach ($org->originators as $originator) { $originator->ownerOrgName = $org->displayName; $originators[] = $originator; } @@ -1695,14 +1691,16 @@ class organization || ($role == 'originator' && $orgUnit->registrationNumber == $userOrgUnit->registrationNumber) // Depositor = all || $role == 'depositor') { + // $originators = $orgUnit->originators; + if (!isset($userOrgs[(string)$orgUnit->ownerOrgId])) { $orgObject = $this->read((string)$orgUnit->ownerOrgId); - + $userOrgs[(string)$orgObject->orgId] = new \stdClass(); $userOrgs[(string)$orgObject->orgId]->displayName = $orgObject->displayName; - $userOrgs[(string)$orgObject->orgId]->{$role} = []; + $userOrgs[(string)$orgObject->orgId]->originators = []; } - $userOrgs[(string)$orgObject->orgId]->{$role}[] = $orgUnit; + $userOrgs[(string)$orgObject->orgId]->originators[] = $orgUnit; } } } diff --git a/src/presentation/maarchRM/Presenter/recordsManagement/archive.php b/src/presentation/maarchRM/Presenter/recordsManagement/archive.php index 33cde9368a6d12f0754c354fd5b652b4289198d6..b2613a98cec3e071ae35a47ffc96fe57c631e8b2 100755 --- a/src/presentation/maarchRM/Presenter/recordsManagement/archive.php +++ b/src/presentation/maarchRM/Presenter/recordsManagement/archive.php @@ -79,7 +79,7 @@ class archive $emptyRole = false; // $ownerOriginatorOrgs = $this->getOwnerOriginatorsOrgs($currentService); - $orgController = \laabs::newController('organization/organization'); + /* $orgController = \laabs::newController('organization/organization'); $originators = $orgController->getOriginator(); foreach ($originators as $originator) { if (!isset($ownerOriginatorOrgs[(string) $originator->ownerOrgId])) { @@ -90,7 +90,7 @@ class archive if (!in_array($originator, $ownerOriginatorOrgs[(string) $originator->ownerOrgId]->originators)) { $ownerOriginatorOrgs[(string)$originator->ownerOrgId]->originators[] = $originator; } - } + } */ } $descriptionSchemeNames = \laabs::callService('recordsManagement/descriptionScheme/read_name_Descriptionfields'); @@ -125,7 +125,7 @@ class archive $this->view->setSource("retentionRules", $retentionRules); $this->view->setSource("emptyRole", $emptyRole); $this->view->setSource("profiles", $profiles); - $this->view->setSource("organizationsOriginator", $ownerOriginatorOrgs); + // $this->view->setSource("organizationsOriginator", $ownerOriginatorOrgs); $this->view->setSource("deleteDescription", $deleteDescription); $this->view->setSource("descriptionScheme", $descriptionSchemeNames); @@ -242,6 +242,7 @@ class archive $archive->hasRights = false; } else { $archive->hasRights = $archiveController->checkRights($archive); + // $archive->hasRights = true; } } catch (\Exception $e) { $archive->hasRights = false; diff --git a/src/presentation/maarchRM/Resources/locale/fr/organization/messages.po b/src/presentation/maarchRM/Resources/locale/fr/organization/messages.po index 4211b61b7d8c7b38903c093f7c8d86c4348e4f36..1642d9ff511f5898001979ab8cdb805bf12c897a 100755 --- a/src/presentation/maarchRM/Resources/locale/fr/organization/messages.po +++ b/src/presentation/maarchRM/Resources/locale/fr/organization/messages.po @@ -204,8 +204,8 @@ msgstr "Comptes de service" msgid "Submit" msgstr "Valider" -msgid "You must use only letters, numbers and the special character '_'" -msgstr "Vous devez utiliser uniquement les lettres, les chiffres et le caractère spécial '_'" +msgid "You must use only letters, numbers and the special characters ('_','-','/' and '.')" +msgstr "Vous devez utiliser uniquement les lettres, les chiffres et les caractères spéciaux ('_','-','/' et '.')" msgid "The first and last character must be a letter. You must use only letters and the special character '_'" msgstr "Les premier et dernier caractères doivent être des lettres. Vous devez utiliser uniquement les lettres et le caractère spécial '_'" diff --git a/src/presentation/maarchRM/Resources/view/organization/organizationForm.html b/src/presentation/maarchRM/Resources/view/organization/organizationForm.html index 4297c95b0df8bf03a949f9d9e0565edc9510d4d8..20d1ff07a52b612190d9f472ef0ae0647b710d47 100755 --- a/src/presentation/maarchRM/Resources/view/organization/organizationForm.html +++ b/src/presentation/maarchRM/Resources/view/organization/organizationForm.html @@ -33,7 +33,7 @@
- You must use only letters, numbers and the special character '_' + You must use only letters, numbers and the special characters ('_','-','/' and '.')