diff --git a/lib/Alchemy/Phrasea/Helper/User/Edit.php b/lib/Alchemy/Phrasea/Helper/User/Edit.php index a667f9ffe9..357324c647 100644 --- a/lib/Alchemy/Phrasea/Helper/User/Edit.php +++ b/lib/Alchemy/Phrasea/Helper/User/Edit.php @@ -184,7 +184,7 @@ class Edit extends \Alchemy\Phrasea\Helper\Helper $query = $this->app['phraseanet.user-query']; $templates = $query - ->only_templates(true) + ->only_user_templates(true) ->execute()->get_results(); $this->users_datas = $rs; diff --git a/lib/Alchemy/Phrasea/Helper/User/Manage.php b/lib/Alchemy/Phrasea/Helper/User/Manage.php index 528b060b80..0d2843b29e 100644 --- a/lib/Alchemy/Phrasea/Helper/User/Manage.php +++ b/lib/Alchemy/Phrasea/Helper/User/Manage.php @@ -57,7 +57,7 @@ class Manage extends Helper 'last_model' => $this->request->get('last_model'), 'filter_guest_user' => $this->request->get('filter_guest_user') ? true : false, 'filter_phantoms_only' => $this->request->get('filter_phantoms_only') ? true : false, - 'filter_model_user' => $this->request->get('filter_model_user') ? true : false, + 'filter_model_only' => $this->request->get('filter_model_only') ? true : false, 'srt' => $request->get("srt", \User_Query::SORT_CREATIONDATE), 'ord' => $request->get("ord", \User_Query::ORD_DESC), 'offset_start' => $offset_start, @@ -74,7 +74,7 @@ class Manage extends Helper $results = $query->sort_by($this->query_parms["srt"], $this->query_parms["ord"]) ->like($this->query_parms['like_field'], $this->query_parms['like_value'], $this->query_parms['like_type']) ->last_model_is($this->query_parms['last_model']) - ->include_templates($this->query_parms['filter_model_user']) + ->templates_only($this->query_parms['filter_model_only']) ->get_inactives($this->query_parms['inactives']) ->include_templates(false) ->include_invite($this->query_parms['filter_guest_user']) @@ -105,7 +105,7 @@ class Manage extends Helper 'last_model' => $this->request->get('last_model'), 'filter_guest_user' => $this->request->get('filter_guest_user') ? true : false, 'filter_phantoms_only' => $this->request->get('filter_phantoms_only') ? true : false, - 'filter_model_user' => $this->request->get('filter_model_user') ? true : false, + 'filter_model_only' => $this->request->get('filter_model_only') ? true : false, 'srt' => $this->request->get("srt", \User_Query::SORT_CREATIONDATE), 'ord' => $this->request->get("ord", \User_Query::ORD_DESC), 'per_page' => $results_quantity, @@ -125,7 +125,7 @@ class Manage extends Helper ->date_filter($this->query_parms['date_field'], $this->query_parms['date_value'], $this->query_parms['date_operator']) ->last_model_is($this->query_parms['last_model']) ->get_inactives($this->query_parms['inactives']) - ->include_templates($this->query_parms['filter_model_user']) + ->templates_only($this->query_parms['filter_model_only']) ->include_invite($this->query_parms['filter_guest_user']) ->phantoms_only($this->query_parms['filter_phantoms_only']) ->on_bases_where_i_am($this->app->getAclForUser($this->app->getAuthenticatedUser()), [\ACL::CANADMIN]) @@ -147,7 +147,7 @@ class Manage extends Helper $query = $this->app['phraseanet.user-query']; $templates = $query - ->only_templates(true) + ->only_user_templates(true) ->execute()->get_results(); return [ diff --git a/lib/classes/User/Query.php b/lib/classes/User/Query.php index 28c01e5da8..4f8fe75a9b 100644 --- a/lib/classes/User/Query.php +++ b/lib/classes/User/Query.php @@ -60,7 +60,8 @@ class User_Query protected $bases_restrictions = false; protected $sbas_restrictions = false; protected $include_templates = false; - protected $only_templates = false; + protected $only_user_templates = false; + protected $templates_only = false; protected $email_not_null = false; protected $base_ids = []; protected $sbas_ids = []; @@ -216,15 +217,34 @@ class User_Query } /** - * Restrict to templates + * Restrict to user templates * * @param $boolean * * @return $this */ - public function only_templates($boolean) + public function only_user_templates($boolean) { - $this->only_templates = !!$boolean; + $this->only_user_templates = !!$boolean; + + return $this; + } + + /** + * Restrict only to templates + * + * @param $boolean + * + * @return $this + */ + public function templates_only($boolean) + { + $this->templates_only = !!$boolean; + + // set include template if not restrict only to the templates + if (!$boolean) { + $this->include_templates = true; + } return $this; } @@ -951,7 +971,9 @@ class User_Query $sql .= ' AND Users.email IS NOT NULL '; } - if ($this->only_templates === true) { + if ($this->templates_only) { + $sql .= ' AND model_of IS NOT NULL'; + } elseif ($this->only_user_templates === true) { if (!$this->app->getAuthenticatedUser()) { throw new InvalidArgumentException('Unable to load templates while disconnected'); } @@ -960,8 +982,6 @@ class User_Query $sql .= ' AND model_of IS NULL'; } elseif ($this->app->getAuthenticatedUser()) { $sql .= ' AND (model_of IS NULL OR model_of = ' . $this->app->getAuthenticatedUser()->getId() . ' ) '; - } else { - $sql .= ' AND model_of IS NULL'; } if ($this->emailDomains) { diff --git a/resources/locales/messages.de.xlf b/resources/locales/messages.de.xlf index d5eb48f82e..b2551a230b 100644 --- a/resources/locales/messages.de.xlf +++ b/resources/locales/messages.de.xlf @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. @@ -155,9 +155,9 @@ %n_par_page% par page %n_par_page% pro Seite - web/admin/users.html.twig - web/admin/users.html.twig - web/admin/users.html.twig + web/admin/users.html.twig + web/admin/users.html.twig + web/admin/users.html.twig %name% est momentanement indisponible a cause d'un trop grand nombre de requetes @@ -542,7 +542,7 @@ Access Zugriff actions/Feedback/List-Share.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig Access code @@ -562,17 +562,17 @@ Access to HD Zugriff auf HD Download - web/admin/editusers.html.twig + web/admin/editusers.html.twig Access to image tools Zugriff auf Bild Werkzeug wird erlaubt - web/admin/editusers.html.twig + web/admin/editusers.html.twig Access to preview Zugriff auf Vorschaubild - web/admin/editusers.html.twig + web/admin/editusers.html.twig Access to the above bases constitutes acceptance of the following Terms of Use (TOU). @@ -641,7 +641,7 @@ Active Aktiv - web/admin/editusers.html.twig + web/admin/editusers.html.twig Activer @@ -906,47 +906,47 @@ Allowed to access report Zugriff auf Report wird erlaubt - web/admin/editusers.html.twig + web/admin/editusers.html.twig Allowed to add Hinzufügen wird erlaubt - web/admin/editusers.html.twig + web/admin/editusers.html.twig Allowed to add in basket Erlaubt, Dokumente in Sammelkörbe hinzuzufügen - web/admin/editusers.html.twig + web/admin/editusers.html.twig Allowed to change statuses Status Veränderungen werden erlaubt - web/admin/editusers.html.twig + web/admin/editusers.html.twig Allowed to delete Löschen wird erlaubt - web/admin/editusers.html.twig + web/admin/editusers.html.twig Allowed to edit Verarbeitung wird erlaubt - web/admin/editusers.html.twig + web/admin/editusers.html.twig Allowed to order Ordnen wird erlaubt - web/admin/editusers.html.twig + web/admin/editusers.html.twig Allowed to publish Veröffentlichen wird erlaubt - web/admin/editusers.html.twig + web/admin/editusers.html.twig Allowed to push Push wird erlaubt - web/admin/editusers.html.twig + web/admin/editusers.html.twig Alphabetic asc @@ -999,7 +999,7 @@ Controller/Admin/CollectionController.php admin/collection/suggested_value.html.twig admin/collection/collection.html.twig - web/admin/users.html.twig + web/admin/users.html.twig task-manager/task-editor/task.html.twig web/admin/databases.html.twig admin/databox/databox.html.twig @@ -1141,7 +1141,7 @@ Apply a template Eine Schablone anwenden web/admin/users.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig Apply changes @@ -1174,7 +1174,7 @@ Are you sure you want delete users rights ? Sind Sie sicher, dass Sie die Benutzerzugriffe löschen möchten? - web/admin/users.html.twig + web/admin/users.html.twig Are you sure you want to delete this application? @@ -1195,7 +1195,7 @@ Are you sure you want to reset rights? Sind Sie sicher, die Rechte zurückzusetzen? - web/admin/editusers.html.twig + web/admin/editusers.html.twig Attention @@ -2378,7 +2378,7 @@ Delete all users rights Alle Nutzerrechte löschen web/admin/users.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig Delete basket @@ -2711,12 +2711,12 @@ Edition des droits de %display_name% Bearbeitung von %display_name% Rechten - web/admin/editusers.html.twig + web/admin/editusers.html.twig Edition des droits de %number% utilisateurs Bearbeitung von %number% Benutzer Rechten - web/admin/editusers.html.twig + web/admin/editusers.html.twig Edition impossible @@ -4248,32 +4248,32 @@ Manage DB fields Datenbank Felder verwalten - web/admin/editusers.html.twig + web/admin/editusers.html.twig Manage Database Datenbank verwalten - web/admin/editusers.html.twig + web/admin/editusers.html.twig Manage Thesaurus Thesaurus verwalten - web/admin/editusers.html.twig + web/admin/editusers.html.twig Manage collection Kollektion verwalten - web/admin/editusers.html.twig + web/admin/editusers.html.twig Manage users Benutzer verwalten - web/admin/editusers.html.twig + web/admin/editusers.html.twig Manage values lists Wertelisten verwalten - web/admin/editusers.html.twig + web/admin/editusers.html.twig Mandatory @@ -5056,7 +5056,7 @@ Please confirme the users deletion! Please confirme the users deletion! - web/admin/users.html.twig + web/admin/users.html.twig Please consider send this push to the following users : %recommendation% @@ -5633,13 +5633,13 @@ Reglages:: reglages d acces guest Gast Zugriff Einstellungen web/admin/users.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig Reglages:: reglages d inscitpition automatisee Auto Register Einstellungen web/admin/users.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig Relevance @@ -5675,7 +5675,7 @@ Remove watermark Wasserzeichen entfernen - web/admin/editusers.html.twig + web/admin/editusers.html.twig Rename @@ -6139,7 +6139,7 @@ Set download quotas Download Quoten festlegen - web/admin/editusers.html.twig + web/admin/editusers.html.twig Set labels @@ -6150,12 +6150,12 @@ Set statuses restrictions Status Beschränkungen festlegen - web/admin/editusers.html.twig + web/admin/editusers.html.twig Set time restrictions Zeitliche Beschränkungen festlegen - web/admin/editusers.html.twig + web/admin/editusers.html.twig Setup @@ -8522,7 +8522,7 @@ Tätigkeit Core/Provider/RegistrationServiceProvider.php Controller/Admin/UserController.php - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin/user/registrations.html.twig web/account/account.html.twig @@ -8532,7 +8532,7 @@ Core/Provider/RegistrationServiceProvider.php Controller/Admin/UserController.php web/common/dialog_export.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin/user/registrations.html.twig web/account/account.html.twig @@ -8547,7 +8547,7 @@ Core/Provider/RegistrationServiceProvider.php Controller/Admin/UserController.php web/common/dialog_export.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig web/account/account.html.twig @@ -8578,7 +8578,7 @@ web/common/dialog_export.html.twig web/admin/users.html.twig web/admin/connected-users.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin/user/registrations.html.twig web/account/account.html.twig @@ -8588,7 +8588,7 @@ Core/Provider/RegistrationServiceProvider.php Controller/Admin/UserController.php web/common/dialog_export.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig web/account/account.html.twig @@ -8603,7 +8603,7 @@ web/common/dialog_export.html.twig api/auth/end_user_authorization.html.twig web/admin/users.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin/user/registrations.html.twig web/account/reset-email.html.twig web/account/account.html.twig @@ -8626,7 +8626,7 @@ Controller/Admin/UserController.php web/common/dialog_export.html.twig web/admin/connected-users.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin/user/registrations.html.twig web/account/account.html.twig @@ -8647,7 +8647,7 @@ Core/Provider/RegistrationServiceProvider.php Controller/Admin/UserController.php web/common/dialog_export.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin/user/registrations.html.twig web/account/account.html.twig @@ -8658,7 +8658,7 @@ Event/Subscriber/RegistrationSubscriber.php Controller/Admin/UserController.php web/common/dialog_export.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin/user/registrations.html.twig web/account/account.html.twig @@ -8666,7 +8666,7 @@ admin::compte-utilisateur sexe Anrede Core/Provider/RegistrationServiceProvider.php - web/admin/editusers.html.twig + web/admin/editusers.html.twig web/account/account.html.twig @@ -8677,7 +8677,7 @@ web/common/dialog_export.html.twig web/admin/users.html.twig web/admin/connected-users.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin/user/registrations.html.twig web/account/account.html.twig @@ -8692,7 +8692,7 @@ Controller/Admin/UserController.php web/common/dialog_export.html.twig web/admin/connected-users.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin/user/registrations.html.twig web/account/account.html.twig @@ -8707,7 +8707,7 @@ Core/Provider/RegistrationServiceProvider.php Controller/Admin/UserController.php web/common/dialog_export.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig web/account/account.html.twig @@ -8797,7 +8797,7 @@ Frau Core/Provider/RegistrationServiceProvider.php web/common/dialog_export.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig web/account/account.html.twig @@ -8805,7 +8805,7 @@ Fräulein Core/Provider/RegistrationServiceProvider.php web/common/dialog_export.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig web/account/account.html.twig @@ -8813,7 +8813,7 @@ Herr Core/Provider/RegistrationServiceProvider.php web/common/dialog_export.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig web/account/account.html.twig @@ -9092,9 +9092,9 @@ Ausgewählte Benutzer ändern web/admin/users.html.twig - - admin::userlist: display model - admin::userlist: display model + + admin::userlist: display model only + admin::userlist: display model only web/admin/users.html.twig @@ -9107,20 +9107,35 @@ Geister-Benutzer anzeigen web/admin/users.html.twig + + admin::users: api list + admin::users: api list + web/admin/editusers.html.twig + + + admin::users: list user api application + admin::users: list user api application + web/admin/editusers.html.twig + + + admin::users: no api defined for this user + admin::users: no api defined for this user + web/admin/editusers.html.twig + admin::users:edit: Manage inline selection Eine Option auswählen - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::users:edit: check all right Alle Rechte auf die Kollektion geben - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::users:edit: check read right Leserechte auf die Kollektion geben - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::users:filter: Date filter @@ -9878,7 +9893,7 @@ boutton::choisir Auswählen web/admin/users.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig boutton::commander @@ -10022,7 +10037,7 @@ Bridge/Dailymotion/playlist_createcontainer.html.twig admin/collection/details.html.twig admin/publications/fiche.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig user/import/file.html.twig admin/databox/details.html.twig admin/statusbit/edit.html.twig @@ -10136,7 +10151,7 @@ admin/publications/fiche.html.twig admin/publications/list.html.twig web/admin/subdefs.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig web/admin/setup.html.twig web/admin/structure.html.twig web/admin/dashboard.html.twig @@ -14236,7 +14251,7 @@ Vorsicht: die aktuelle Werte werden durch die neue Werte überschrieben select at least one user Einen Benutzer auswählen - web/admin/users.html.twig + web/admin/users.html.twig separe par un espace @@ -15266,7 +15281,7 @@ Vorsicht: die aktuelle Werte werden durch die neue Werte überschrieben users rights have been reseted Die Benutzerrechte wurden zurückgesetzt - web/admin/users.html.twig + web/admin/users.html.twig validate diff --git a/resources/locales/messages.en.xlf b/resources/locales/messages.en.xlf index 9faf0b049b..89bb04c023 100644 --- a/resources/locales/messages.en.xlf +++ b/resources/locales/messages.en.xlf @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. @@ -155,9 +155,9 @@ %n_par_page% par page %n_par_page% per page - web/admin/users.html.twig - web/admin/users.html.twig - web/admin/users.html.twig + web/admin/users.html.twig + web/admin/users.html.twig + web/admin/users.html.twig %name% est momentanement indisponible a cause d'un trop grand nombre de requetes @@ -542,7 +542,7 @@ Access Access actions/Feedback/List-Share.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig Access code @@ -562,17 +562,17 @@ Access to HD Access to Documents - web/admin/editusers.html.twig + web/admin/editusers.html.twig Access to image tools Access to media tools - web/admin/editusers.html.twig + web/admin/editusers.html.twig Access to preview Access subviews - web/admin/editusers.html.twig + web/admin/editusers.html.twig Access to the above bases constitutes acceptance of the following Terms of Use (TOU). @@ -641,7 +641,7 @@ Active Active - web/admin/editusers.html.twig + web/admin/editusers.html.twig Activer @@ -907,47 +907,47 @@ Allowed to access report Allow to access Report - web/admin/editusers.html.twig + web/admin/editusers.html.twig Allowed to add Allow to add - web/admin/editusers.html.twig + web/admin/editusers.html.twig Allowed to add in basket Allow to add document to basket - web/admin/editusers.html.twig + web/admin/editusers.html.twig Allowed to change statuses Allow to change status - web/admin/editusers.html.twig + web/admin/editusers.html.twig Allowed to delete Allow to delete - web/admin/editusers.html.twig + web/admin/editusers.html.twig Allowed to edit Allow to edit - web/admin/editusers.html.twig + web/admin/editusers.html.twig Allowed to order Allow to order - web/admin/editusers.html.twig + web/admin/editusers.html.twig Allowed to publish Allow to publish - web/admin/editusers.html.twig + web/admin/editusers.html.twig Allowed to push Allow to push - web/admin/editusers.html.twig + web/admin/editusers.html.twig Alphabetic asc @@ -1000,7 +1000,7 @@ Controller/Admin/CollectionController.php admin/collection/suggested_value.html.twig admin/collection/collection.html.twig - web/admin/users.html.twig + web/admin/users.html.twig task-manager/task-editor/task.html.twig web/admin/databases.html.twig admin/databox/databox.html.twig @@ -1142,7 +1142,7 @@ Apply a template Apply a template web/admin/users.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig Apply changes @@ -1175,7 +1175,7 @@ Are you sure you want delete users rights ? Are you sure you want to remove existing users rights? - web/admin/users.html.twig + web/admin/users.html.twig Are you sure you want to delete this application? @@ -1196,7 +1196,7 @@ Are you sure you want to reset rights? Are you sure you want to reset the user rights? - web/admin/editusers.html.twig + web/admin/editusers.html.twig Attention @@ -2381,7 +2381,7 @@ Delete all users rights Delete all users rights web/admin/users.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig Delete basket @@ -2714,12 +2714,12 @@ Edition des droits de %display_name% %display_name% user right edition - web/admin/editusers.html.twig + web/admin/editusers.html.twig Edition des droits de %number% utilisateurs User rights edition of %number% users - web/admin/editusers.html.twig + web/admin/editusers.html.twig Edition impossible @@ -4251,32 +4251,32 @@ Manage DB fields Manage documentary fields of database - web/admin/editusers.html.twig + web/admin/editusers.html.twig Manage Database Manage database - web/admin/editusers.html.twig + web/admin/editusers.html.twig Manage Thesaurus Manage thesaurus - web/admin/editusers.html.twig + web/admin/editusers.html.twig Manage collection Manage collection - web/admin/editusers.html.twig + web/admin/editusers.html.twig Manage users Manage users - web/admin/editusers.html.twig + web/admin/editusers.html.twig Manage values lists Manage values lists - web/admin/editusers.html.twig + web/admin/editusers.html.twig Mandatory @@ -5059,7 +5059,7 @@ Please confirme the users deletion! Please confirme the users deletion! - web/admin/users.html.twig + web/admin/users.html.twig Please consider send this push to the following users : %recommendation% @@ -5636,13 +5636,13 @@ Reglages:: reglages d acces guest Guest access setup web/admin/users.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig Reglages:: reglages d inscitpition automatisee Auto register setup web/admin/users.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig Relevance @@ -5678,7 +5678,7 @@ Remove watermark Remove watermark - web/admin/editusers.html.twig + web/admin/editusers.html.twig Rename @@ -6142,7 +6142,7 @@ Set download quotas Set downloads quotas - web/admin/editusers.html.twig + web/admin/editusers.html.twig Set labels @@ -6153,12 +6153,12 @@ Set statuses restrictions Set status restrictions - web/admin/editusers.html.twig + web/admin/editusers.html.twig Set time restrictions Set time restriction - web/admin/editusers.html.twig + web/admin/editusers.html.twig Setup @@ -8525,7 +8525,7 @@ Activity Core/Provider/RegistrationServiceProvider.php Controller/Admin/UserController.php - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin/user/registrations.html.twig web/account/account.html.twig @@ -8535,7 +8535,7 @@ Core/Provider/RegistrationServiceProvider.php Controller/Admin/UserController.php web/common/dialog_export.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin/user/registrations.html.twig web/account/account.html.twig @@ -8550,7 +8550,7 @@ Core/Provider/RegistrationServiceProvider.php Controller/Admin/UserController.php web/common/dialog_export.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig web/account/account.html.twig @@ -8581,7 +8581,7 @@ web/common/dialog_export.html.twig web/admin/users.html.twig web/admin/connected-users.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin/user/registrations.html.twig web/account/account.html.twig @@ -8591,7 +8591,7 @@ Core/Provider/RegistrationServiceProvider.php Controller/Admin/UserController.php web/common/dialog_export.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig web/account/account.html.twig @@ -8606,7 +8606,7 @@ web/common/dialog_export.html.twig api/auth/end_user_authorization.html.twig web/admin/users.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin/user/registrations.html.twig web/account/reset-email.html.twig web/account/account.html.twig @@ -8629,7 +8629,7 @@ Controller/Admin/UserController.php web/common/dialog_export.html.twig web/admin/connected-users.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin/user/registrations.html.twig web/account/account.html.twig @@ -8650,7 +8650,7 @@ Core/Provider/RegistrationServiceProvider.php Controller/Admin/UserController.php web/common/dialog_export.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin/user/registrations.html.twig web/account/account.html.twig @@ -8661,7 +8661,7 @@ Event/Subscriber/RegistrationSubscriber.php Controller/Admin/UserController.php web/common/dialog_export.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin/user/registrations.html.twig web/account/account.html.twig @@ -8669,7 +8669,7 @@ admin::compte-utilisateur sexe Gender Core/Provider/RegistrationServiceProvider.php - web/admin/editusers.html.twig + web/admin/editusers.html.twig web/account/account.html.twig @@ -8680,7 +8680,7 @@ web/common/dialog_export.html.twig web/admin/users.html.twig web/admin/connected-users.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin/user/registrations.html.twig web/account/account.html.twig @@ -8695,7 +8695,7 @@ Controller/Admin/UserController.php web/common/dialog_export.html.twig web/admin/connected-users.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin/user/registrations.html.twig web/account/account.html.twig @@ -8710,7 +8710,7 @@ Core/Provider/RegistrationServiceProvider.php Controller/Admin/UserController.php web/common/dialog_export.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig web/account/account.html.twig @@ -8800,7 +8800,7 @@ Mrs. Core/Provider/RegistrationServiceProvider.php web/common/dialog_export.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig web/account/account.html.twig @@ -8808,7 +8808,7 @@ Miss Core/Provider/RegistrationServiceProvider.php web/common/dialog_export.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig web/account/account.html.twig @@ -8816,7 +8816,7 @@ Mr. Core/Provider/RegistrationServiceProvider.php web/common/dialog_export.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig web/account/account.html.twig @@ -9095,9 +9095,9 @@ Modify selected users web/admin/users.html.twig - - admin::userlist: display model - admin::userlist: display model + + admin::userlist: display model only + admin::userlist: display model only web/admin/users.html.twig @@ -9110,20 +9110,35 @@ Display ghosts users web/admin/users.html.twig + + admin::users: api list + admin::users: api list + web/admin/editusers.html.twig + + + admin::users: list user api application + admin::users: list user api application + web/admin/editusers.html.twig + + + admin::users: no api defined for this user + admin::users: no api defined for this user + web/admin/editusers.html.twig + admin::users:edit: Manage inline selection Select an option - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::users:edit: check all right Give all rights on the collection - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::users:edit: check read right Give Read permission on the collection - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::users:filter: Date filter @@ -9881,7 +9896,7 @@ boutton::choisir Choose web/admin/users.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig boutton::commander @@ -10025,7 +10040,7 @@ Bridge/Dailymotion/playlist_createcontainer.html.twig admin/collection/details.html.twig admin/publications/fiche.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig user/import/file.html.twig admin/databox/details.html.twig admin/statusbit/edit.html.twig @@ -10139,7 +10154,7 @@ admin/publications/fiche.html.twig admin/publications/list.html.twig web/admin/subdefs.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig web/admin/setup.html.twig web/admin/structure.html.twig web/admin/dashboard.html.twig @@ -14244,7 +14259,7 @@ It is possible to place several search areas select at least one user One user at least must be selected - web/admin/users.html.twig + web/admin/users.html.twig separe par un espace @@ -15274,7 +15289,7 @@ It is possible to place several search areas users rights have been reseted Users rights have been reseted - web/admin/users.html.twig + web/admin/users.html.twig validate diff --git a/resources/locales/messages.fr.xlf b/resources/locales/messages.fr.xlf index 7d96e15bde..ab4f8c064f 100644 --- a/resources/locales/messages.fr.xlf +++ b/resources/locales/messages.fr.xlf @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. @@ -155,9 +155,9 @@ %n_par_page% par page %n_par_page% par page - web/admin/users.html.twig - web/admin/users.html.twig - web/admin/users.html.twig + web/admin/users.html.twig + web/admin/users.html.twig + web/admin/users.html.twig %name% est momentanement indisponible a cause d'un trop grand nombre de requetes @@ -542,7 +542,7 @@ Access Accès actions/Feedback/List-Share.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig Access code @@ -562,17 +562,17 @@ Access to HD Autoriser à télécharger les Documents - web/admin/editusers.html.twig + web/admin/editusers.html.twig Access to image tools Autoriser à accéder aux outils images - web/admin/editusers.html.twig + web/admin/editusers.html.twig Access to preview Accès aux sous résolutions - web/admin/editusers.html.twig + web/admin/editusers.html.twig Access to the above bases constitutes acceptance of the following Terms of Use (TOU). @@ -641,7 +641,7 @@ Active Actif - web/admin/editusers.html.twig + web/admin/editusers.html.twig Activer @@ -906,47 +906,47 @@ Allowed to access report Autoriser à consulter Phraseanet Report - web/admin/editusers.html.twig + web/admin/editusers.html.twig Allowed to add Autoriser à ajouter des documents - web/admin/editusers.html.twig + web/admin/editusers.html.twig Allowed to add in basket Autoriser à créer des paniers - web/admin/editusers.html.twig + web/admin/editusers.html.twig Allowed to change statuses Autoriser à changer les status - web/admin/editusers.html.twig + web/admin/editusers.html.twig Allowed to delete Autoriser à supprimer des documents - web/admin/editusers.html.twig + web/admin/editusers.html.twig Allowed to edit Autoriser à éditer les notices - web/admin/editusers.html.twig + web/admin/editusers.html.twig Allowed to order Autoriser à commander - web/admin/editusers.html.twig + web/admin/editusers.html.twig Allowed to publish Autoriser à publier - web/admin/editusers.html.twig + web/admin/editusers.html.twig Allowed to push Autoriser à faire des diffusions - web/admin/editusers.html.twig + web/admin/editusers.html.twig Alphabetic asc @@ -999,7 +999,7 @@ Controller/Admin/CollectionController.php admin/collection/suggested_value.html.twig admin/collection/collection.html.twig - web/admin/users.html.twig + web/admin/users.html.twig task-manager/task-editor/task.html.twig web/admin/databases.html.twig admin/databox/databox.html.twig @@ -1141,7 +1141,7 @@ Apply a template Appliquer un modèle web/admin/users.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig Apply changes @@ -1174,7 +1174,7 @@ Are you sure you want delete users rights ? Etes-vous sûr de vouloir initialiser les droits des utilisateurs ? - web/admin/users.html.twig + web/admin/users.html.twig Are you sure you want to delete this application? @@ -1195,7 +1195,7 @@ Are you sure you want to reset rights? Etes-vous sûr de vouloir réinitialiser les droits ? - web/admin/editusers.html.twig + web/admin/editusers.html.twig Attention @@ -2378,7 +2378,7 @@ Delete all users rights Supprimer tous les droits de l'utilisateur web/admin/users.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig Delete basket @@ -2711,12 +2711,12 @@ Edition des droits de %display_name% Edition des droits de %display_name% - web/admin/editusers.html.twig + web/admin/editusers.html.twig Edition des droits de %number% utilisateurs Edition des droits de %number% utilisateurs - web/admin/editusers.html.twig + web/admin/editusers.html.twig Edition impossible @@ -4248,32 +4248,32 @@ Manage DB fields Gérer les champs documentaires - web/admin/editusers.html.twig + web/admin/editusers.html.twig Manage Database Gérer la Base de Données - web/admin/editusers.html.twig + web/admin/editusers.html.twig Manage Thesaurus Gérer le thesaurus - web/admin/editusers.html.twig + web/admin/editusers.html.twig Manage collection Autoriser à gérer les paramètres de collection - web/admin/editusers.html.twig + web/admin/editusers.html.twig Manage users Autoriser à gérer les utilisateurs - web/admin/editusers.html.twig + web/admin/editusers.html.twig Manage values lists Gérer les valeurs suggérées - web/admin/editusers.html.twig + web/admin/editusers.html.twig Mandatory @@ -5056,7 +5056,7 @@ Please confirme the users deletion! Please confirme the users deletion! - web/admin/users.html.twig + web/admin/users.html.twig Please consider send this push to the following users : %recommendation% @@ -5635,13 +5635,13 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Reglages:: reglages d acces guest Réglages d'accès invité web/admin/users.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig Reglages:: reglages d inscitpition automatisee Réglages d'auto-inscription web/admin/users.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig Relevance @@ -5677,7 +5677,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Remove watermark Sans filigrane - web/admin/editusers.html.twig + web/admin/editusers.html.twig Rename @@ -6141,7 +6141,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Set download quotas Régler les quotas de téléchargement - web/admin/editusers.html.twig + web/admin/editusers.html.twig Set labels @@ -6152,12 +6152,12 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Set statuses restrictions Régler les droits d'accès selon les status - web/admin/editusers.html.twig + web/admin/editusers.html.twig Set time restrictions Régler les restrictions temporelles - web/admin/editusers.html.twig + web/admin/editusers.html.twig Setup @@ -8524,7 +8524,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Activité Core/Provider/RegistrationServiceProvider.php Controller/Admin/UserController.php - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin/user/registrations.html.twig web/account/account.html.twig @@ -8534,7 +8534,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Core/Provider/RegistrationServiceProvider.php Controller/Admin/UserController.php web/common/dialog_export.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin/user/registrations.html.twig web/account/account.html.twig @@ -8549,7 +8549,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Core/Provider/RegistrationServiceProvider.php Controller/Admin/UserController.php web/common/dialog_export.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig web/account/account.html.twig @@ -8580,7 +8580,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis web/common/dialog_export.html.twig web/admin/users.html.twig web/admin/connected-users.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin/user/registrations.html.twig web/account/account.html.twig @@ -8590,7 +8590,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Core/Provider/RegistrationServiceProvider.php Controller/Admin/UserController.php web/common/dialog_export.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig web/account/account.html.twig @@ -8605,7 +8605,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis web/common/dialog_export.html.twig api/auth/end_user_authorization.html.twig web/admin/users.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin/user/registrations.html.twig web/account/reset-email.html.twig web/account/account.html.twig @@ -8628,7 +8628,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Controller/Admin/UserController.php web/common/dialog_export.html.twig web/admin/connected-users.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin/user/registrations.html.twig web/account/account.html.twig @@ -8649,7 +8649,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Core/Provider/RegistrationServiceProvider.php Controller/Admin/UserController.php web/common/dialog_export.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin/user/registrations.html.twig web/account/account.html.twig @@ -8660,7 +8660,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Event/Subscriber/RegistrationSubscriber.php Controller/Admin/UserController.php web/common/dialog_export.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin/user/registrations.html.twig web/account/account.html.twig @@ -8668,7 +8668,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis admin::compte-utilisateur sexe Civilité Core/Provider/RegistrationServiceProvider.php - web/admin/editusers.html.twig + web/admin/editusers.html.twig web/account/account.html.twig @@ -8679,7 +8679,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis web/common/dialog_export.html.twig web/admin/users.html.twig web/admin/connected-users.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin/user/registrations.html.twig web/account/account.html.twig @@ -8694,7 +8694,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Controller/Admin/UserController.php web/common/dialog_export.html.twig web/admin/connected-users.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin/user/registrations.html.twig web/account/account.html.twig @@ -8709,7 +8709,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Core/Provider/RegistrationServiceProvider.php Controller/Admin/UserController.php web/common/dialog_export.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig web/account/account.html.twig @@ -8800,7 +8800,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Mme Core/Provider/RegistrationServiceProvider.php web/common/dialog_export.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig web/account/account.html.twig @@ -8808,7 +8808,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Mlle Core/Provider/RegistrationServiceProvider.php web/common/dialog_export.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig web/account/account.html.twig @@ -8816,7 +8816,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le M. Core/Provider/RegistrationServiceProvider.php web/common/dialog_export.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig web/account/account.html.twig @@ -9095,9 +9095,9 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Modifier les utilisateurs sélectionnés web/admin/users.html.twig - - admin::userlist: display model - admin::userlist: display model + + admin::userlist: display model only + admin::userlist: display model only web/admin/users.html.twig @@ -9110,20 +9110,35 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Afficher les utilisateurs fantômes web/admin/users.html.twig + + admin::users: api list + admin::users: api list + web/admin/editusers.html.twig + + + admin::users: list user api application + admin::users: list user api application + web/admin/editusers.html.twig + + + admin::users: no api defined for this user + admin::users: no api defined for this user + web/admin/editusers.html.twig + admin::users:edit: Manage inline selection Sélectionner une option - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::users:edit: check all right Tous les droits sur la collection - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::users:edit: check read right Droits de lecture sur la collection - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::users:filter: Date filter @@ -9881,7 +9896,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le boutton::choisir Choisir web/admin/users.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig boutton::commander @@ -10025,7 +10040,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Bridge/Dailymotion/playlist_createcontainer.html.twig admin/collection/details.html.twig admin/publications/fiche.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig user/import/file.html.twig admin/databox/details.html.twig admin/statusbit/edit.html.twig @@ -10139,7 +10154,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le admin/publications/fiche.html.twig admin/publications/list.html.twig web/admin/subdefs.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig web/admin/setup.html.twig web/admin/structure.html.twig web/admin/dashboard.html.twig @@ -14247,7 +14262,7 @@ Attention: les valeurs actuellement en place seront écrasées par ces nouvelles select at least one user Sélectionner au moins un utilisateur - web/admin/users.html.twig + web/admin/users.html.twig separe par un espace @@ -15277,7 +15292,7 @@ Attention: les valeurs actuellement en place seront écrasées par ces nouvelles users rights have been reseted Les droits utilisateurs ont été ré-initialisés - web/admin/users.html.twig + web/admin/users.html.twig validate diff --git a/resources/locales/messages.nl.xlf b/resources/locales/messages.nl.xlf index 6a34b0f4b6..5a9896f997 100644 --- a/resources/locales/messages.nl.xlf +++ b/resources/locales/messages.nl.xlf @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. @@ -155,9 +155,9 @@ %n_par_page% par page %n_par_page% per pagina - web/admin/users.html.twig - web/admin/users.html.twig - web/admin/users.html.twig + web/admin/users.html.twig + web/admin/users.html.twig + web/admin/users.html.twig %name% est momentanement indisponible a cause d'un trop grand nombre de requetes @@ -542,7 +542,7 @@ Access Toegang actions/Feedback/List-Share.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig Access code @@ -562,17 +562,17 @@ Access to HD Toegang tot HD - web/admin/editusers.html.twig + web/admin/editusers.html.twig Access to image tools Toegang tot beeldgereedschappen - web/admin/editusers.html.twig + web/admin/editusers.html.twig Access to preview Toegang tot voorvertoning - web/admin/editusers.html.twig + web/admin/editusers.html.twig Access to the above bases constitutes acceptance of the following Terms of Use (TOU). @@ -641,7 +641,7 @@ Active Actief - web/admin/editusers.html.twig + web/admin/editusers.html.twig Activer @@ -908,47 +908,47 @@ Allowed to access report Toegestaan ​​om rapport te openen - web/admin/editusers.html.twig + web/admin/editusers.html.twig Allowed to add Toegestaan om toe te voegen - web/admin/editusers.html.twig + web/admin/editusers.html.twig Allowed to add in basket Toegestaan om in mandje te plaatsen - web/admin/editusers.html.twig + web/admin/editusers.html.twig Allowed to change statuses Toegestaan om statussen te veranderen - web/admin/editusers.html.twig + web/admin/editusers.html.twig Allowed to delete Toegestaan om te verwijderen - web/admin/editusers.html.twig + web/admin/editusers.html.twig Allowed to edit Toegestaan om te bewerken - web/admin/editusers.html.twig + web/admin/editusers.html.twig Allowed to order Toegestaan om te sorteren - web/admin/editusers.html.twig + web/admin/editusers.html.twig Allowed to publish Publiceren toegelaten - web/admin/editusers.html.twig + web/admin/editusers.html.twig Allowed to push Toegestaan om door te sturen - web/admin/editusers.html.twig + web/admin/editusers.html.twig Alphabetic asc @@ -1001,7 +1001,7 @@ Controller/Admin/CollectionController.php admin/collection/suggested_value.html.twig admin/collection/collection.html.twig - web/admin/users.html.twig + web/admin/users.html.twig task-manager/task-editor/task.html.twig web/admin/databases.html.twig admin/databox/databox.html.twig @@ -1143,7 +1143,7 @@ Apply a template Pas een sjabloon toe web/admin/users.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig Apply changes @@ -1176,7 +1176,7 @@ Are you sure you want delete users rights ? Bent u zeker om de gebruikersrechten te verwijderen? - web/admin/users.html.twig + web/admin/users.html.twig Are you sure you want to delete this application? @@ -1197,7 +1197,7 @@ Are you sure you want to reset rights? Bent u zeker om de rechten te herstellen? - web/admin/editusers.html.twig + web/admin/editusers.html.twig Attention @@ -2384,7 +2384,7 @@ Delete all users rights Verwijder alle gebruikersrechten web/admin/users.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig Delete basket @@ -2717,12 +2717,12 @@ Edition des droits de %display_name% Rechten aanpassingen voor %display_name% - web/admin/editusers.html.twig + web/admin/editusers.html.twig Edition des droits de %number% utilisateurs Rechten aanpassingen voor %number% gebruikers - web/admin/editusers.html.twig + web/admin/editusers.html.twig Edition impossible @@ -4260,32 +4260,32 @@ Manage DB fields Begeer DB velden - web/admin/editusers.html.twig + web/admin/editusers.html.twig Manage Database Beheer Database - web/admin/editusers.html.twig + web/admin/editusers.html.twig Manage Thesaurus Beheer Thesaurus - web/admin/editusers.html.twig + web/admin/editusers.html.twig Manage collection Beheer collectie - web/admin/editusers.html.twig + web/admin/editusers.html.twig Manage users Beheer gebruikers - web/admin/editusers.html.twig + web/admin/editusers.html.twig Manage values lists Beheer waarden lijsten - web/admin/editusers.html.twig + web/admin/editusers.html.twig Mandatory @@ -5068,7 +5068,7 @@ Please confirme the users deletion! Please confirme the users deletion! - web/admin/users.html.twig + web/admin/users.html.twig Please consider send this push to the following users : %recommendation% @@ -5645,13 +5645,13 @@ Reglages:: reglages d acces guest instellingen voor gasttoegang web/admin/users.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig Reglages:: reglages d inscitpition automatisee instellingen voor automatisch inschrijven web/admin/users.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig Relevance @@ -5687,7 +5687,7 @@ Remove watermark Verwijder watermerk - web/admin/editusers.html.twig + web/admin/editusers.html.twig Rename @@ -6151,7 +6151,7 @@ Set download quotas Stel downloaden quota in - web/admin/editusers.html.twig + web/admin/editusers.html.twig Set labels @@ -6162,12 +6162,12 @@ Set statuses restrictions Stel statusbeperkingen in - web/admin/editusers.html.twig + web/admin/editusers.html.twig Set time restrictions Stel tijdsbeperkingen in - web/admin/editusers.html.twig + web/admin/editusers.html.twig Setup @@ -8534,7 +8534,7 @@ Activiteit Core/Provider/RegistrationServiceProvider.php Controller/Admin/UserController.php - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin/user/registrations.html.twig web/account/account.html.twig @@ -8544,7 +8544,7 @@ Core/Provider/RegistrationServiceProvider.php Controller/Admin/UserController.php web/common/dialog_export.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin/user/registrations.html.twig web/account/account.html.twig @@ -8559,7 +8559,7 @@ Core/Provider/RegistrationServiceProvider.php Controller/Admin/UserController.php web/common/dialog_export.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig web/account/account.html.twig @@ -8590,7 +8590,7 @@ web/common/dialog_export.html.twig web/admin/users.html.twig web/admin/connected-users.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin/user/registrations.html.twig web/account/account.html.twig @@ -8600,7 +8600,7 @@ Core/Provider/RegistrationServiceProvider.php Controller/Admin/UserController.php web/common/dialog_export.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig web/account/account.html.twig @@ -8615,7 +8615,7 @@ web/common/dialog_export.html.twig api/auth/end_user_authorization.html.twig web/admin/users.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin/user/registrations.html.twig web/account/reset-email.html.twig web/account/account.html.twig @@ -8638,7 +8638,7 @@ Controller/Admin/UserController.php web/common/dialog_export.html.twig web/admin/connected-users.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin/user/registrations.html.twig web/account/account.html.twig @@ -8659,7 +8659,7 @@ Core/Provider/RegistrationServiceProvider.php Controller/Admin/UserController.php web/common/dialog_export.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin/user/registrations.html.twig web/account/account.html.twig @@ -8670,7 +8670,7 @@ Event/Subscriber/RegistrationSubscriber.php Controller/Admin/UserController.php web/common/dialog_export.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin/user/registrations.html.twig web/account/account.html.twig @@ -8678,7 +8678,7 @@ admin::compte-utilisateur sexe Geslacht Core/Provider/RegistrationServiceProvider.php - web/admin/editusers.html.twig + web/admin/editusers.html.twig web/account/account.html.twig @@ -8689,7 +8689,7 @@ web/common/dialog_export.html.twig web/admin/users.html.twig web/admin/connected-users.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin/user/registrations.html.twig web/account/account.html.twig @@ -8704,7 +8704,7 @@ Controller/Admin/UserController.php web/common/dialog_export.html.twig web/admin/connected-users.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin/user/registrations.html.twig web/account/account.html.twig @@ -8719,7 +8719,7 @@ Core/Provider/RegistrationServiceProvider.php Controller/Admin/UserController.php web/common/dialog_export.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig web/account/account.html.twig @@ -8809,7 +8809,7 @@ Mevrouw Core/Provider/RegistrationServiceProvider.php web/common/dialog_export.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig web/account/account.html.twig @@ -8817,7 +8817,7 @@ Jufrouw Core/Provider/RegistrationServiceProvider.php web/common/dialog_export.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig web/account/account.html.twig @@ -8825,7 +8825,7 @@ De heer Core/Provider/RegistrationServiceProvider.php web/common/dialog_export.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig web/account/account.html.twig @@ -9104,9 +9104,9 @@ admin::userlist modify web/admin/users.html.twig - - admin::userlist: display model - admin::userlist: display model + + admin::userlist: display model only + admin::userlist: display model only web/admin/users.html.twig @@ -9119,20 +9119,35 @@ admin::userlist: phantoms only web/admin/users.html.twig + + admin::users: api list + admin::users: api list + web/admin/editusers.html.twig + + + admin::users: list user api application + admin::users: list user api application + web/admin/editusers.html.twig + + + admin::users: no api defined for this user + admin::users: no api defined for this user + web/admin/editusers.html.twig + admin::users:edit: Manage inline selection admin::users:edit: Manage inline selection - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::users:edit: check all right admin::users:edit: check all right - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::users:edit: check read right admin::users:edit: check read right - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::users:filter: Date filter @@ -9890,7 +9905,7 @@ boutton::choisir kiezen web/admin/users.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig boutton::commander @@ -10034,7 +10049,7 @@ Bridge/Dailymotion/playlist_createcontainer.html.twig admin/collection/details.html.twig admin/publications/fiche.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig user/import/file.html.twig admin/databox/details.html.twig admin/statusbit/edit.html.twig @@ -10148,7 +10163,7 @@ admin/publications/fiche.html.twig admin/publications/list.html.twig web/admin/subdefs.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig web/admin/setup.html.twig web/admin/structure.html.twig web/admin/dashboard.html.twig @@ -14247,7 +14262,7 @@ select at least one user selecteer ten minste één gebruiker - web/admin/users.html.twig + web/admin/users.html.twig separe par un espace @@ -15277,7 +15292,7 @@ users rights have been reseted gebruikersrechten werden teruggezet - web/admin/users.html.twig + web/admin/users.html.twig validate diff --git a/resources/locales/validators.de.xlf b/resources/locales/validators.de.xlf index 011eb75003..c8af0245fd 100644 --- a/resources/locales/validators.de.xlf +++ b/resources/locales/validators.de.xlf @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. diff --git a/resources/locales/validators.en.xlf b/resources/locales/validators.en.xlf index 951757042e..138bf03efe 100644 --- a/resources/locales/validators.en.xlf +++ b/resources/locales/validators.en.xlf @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. diff --git a/resources/locales/validators.fr.xlf b/resources/locales/validators.fr.xlf index c59aef0810..aaf109c92a 100644 --- a/resources/locales/validators.fr.xlf +++ b/resources/locales/validators.fr.xlf @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. diff --git a/resources/locales/validators.nl.xlf b/resources/locales/validators.nl.xlf index d5e7608bad..95d610f821 100644 --- a/resources/locales/validators.nl.xlf +++ b/resources/locales/validators.nl.xlf @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. diff --git a/templates/web/admin/editusers.html.twig b/templates/web/admin/editusers.html.twig index 000453fbab..e300eaab54 100644 --- a/templates/web/admin/editusers.html.twig +++ b/templates/web/admin/editusers.html.twig @@ -79,9 +79,12 @@ {{ 'Rights' | trans }} {% if main_user is not empty and main_user.isTemplate is empty and main_user.isSpecial is empty %} -
  • - {{ 'Infos' | trans }} -
  • +
  • + {{ 'Infos' | trans }} +
  • +
  • + {{ 'admin::users: api list' | trans }} +
  • {% endif %}
    @@ -408,7 +411,7 @@
    {% if main_user is not empty and main_user.isTemplate is empty and main_user.isSpecial is empty %} -
    +
    @@ -524,6 +527,18 @@
    + +
    +

    {{ 'admin::users: list user api application' | trans }}

    + {% set apiApplications = app['repo.api-applications'].findByUser(main_user) %} + {% if apiApplications|length > 0 %} + {% for apiApplication in app['repo.api-applications'].findByUser(main_user) %} +

    - {{ apiApplication.getName() }}

    + {% endfor %} + {% else %} +
    {{ 'admin::users: no api defined for this user' | trans }}
    + {% endif %} +
    {% endif %}
    diff --git a/templates/web/admin/users.html.twig b/templates/web/admin/users.html.twig index 7c969a677c..35b65199a6 100644 --- a/templates/web/admin/users.html.twig +++ b/templates/web/admin/users.html.twig @@ -42,8 +42,8 @@

    {{ 'Filter' | trans }} @@ -229,7 +229,7 @@ - + @@ -288,7 +288,7 @@ - +