From 78fedd79b21fe237f25f3a89c32299fb7f2f708a Mon Sep 17 00:00:00 2001 From: Benjamin Renard Date: Tue, 16 Mar 2021 17:52:08 +0100 Subject: [PATCH] LSaccessRightsMatrixView: handle inherited rights from user LSprofiles --- src/css/default/LSaccessRightsMatrixView.css | 14 +++ src/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.mo | Bin 66332 -> 66458 bytes src/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.po | 71 +++++++++------ src/lang/ldapsaisie.pot | 69 ++++++++------ .../default/LSaccessRightsMatrixView.tpl | 86 ++++++++++-------- .../LSaccessRightsMatrixView_attr_row.tpl | 16 ++++ 6 files changed, 160 insertions(+), 96 deletions(-) create mode 100644 src/templates/default/LSaccessRightsMatrixView_attr_row.tpl diff --git a/src/css/default/LSaccessRightsMatrixView.css b/src/css/default/LSaccessRightsMatrixView.css index 32fa1902..d6f2bf75 100644 --- a/src/css/default/LSaccessRightsMatrixView.css +++ b/src/css/default/LSaccessRightsMatrixView.css @@ -121,6 +121,10 @@ span.LSaccessRightsMatrixView_allowed { border-color: #28a745; } +span.LSaccessRightsMatrixView_inherit { + opacity: 0.3; +} + /* * Tabs */ @@ -174,6 +178,16 @@ div.LSaccessRightsMatrixView_tab_content h2 { font-weight: normal; } +#LSaccessRightsMatrixView_legend label { + display: block; + text-decoration: underline; +} + +#LSaccessRightsMatrixView_legend p { + margin: 0; + margin-bottom: 0.3em; +} + /* * Subtitle */ diff --git a/src/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.mo b/src/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.mo index 45ee6ddea7b173ad7485dabf502f4162c3af88fc..582ee7117b8d8f941b7d26913553be20fe29bcc1 100644 GIT binary patch delta 9200 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 delta 9102 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\n" "Language-Team: LdapSaisie \n" @@ -2492,8 +2492,8 @@ msgstr "Mme." msgid "Mr." msgstr "M." -#: templates/default/LSaccessRightsMatrixView.tpl:119 -#: templates/default/LSaccessRightsMatrixView.tpl:153 +#: templates/default/LSaccessRightsMatrixView.tpl:115 +#: templates/default/LSaccessRightsMatrixView.tpl:155 msgid "Allowed" msgstr "Autorisé" @@ -2513,16 +2513,16 @@ msgstr "Se connecter" msgid "Connected as" msgstr "Connecté en tant que" -#: templates/default/LSaccessRightsMatrixView.tpl:111 +#: templates/default/LSaccessRightsMatrixView.tpl:107 msgid "Custom actions" msgstr "Actions personnalisées" -#: templates/default/LSaccessRightsMatrixView.tpl:116 -#: templates/default/LSaccessRightsMatrixView.tpl:150 +#: templates/default/LSaccessRightsMatrixView.tpl:112 +#: templates/default/LSaccessRightsMatrixView.tpl:152 msgid "Custom actions / Profiles" msgstr "Actions personnalisées / Profils" -#: templates/default/LSaccessRightsMatrixView.tpl:145 +#: templates/default/LSaccessRightsMatrixView.tpl:147 msgid "Custom search actions" msgstr "Actions personnalisées sur les recherches" @@ -2570,9 +2570,9 @@ msgid "Language" msgstr "Langue" #: templates/default/LSaccessRightsMatrixView.tpl:20 -#: templates/default/LSaccessRightsMatrixView.tpl:80 -#: templates/default/LSaccessRightsMatrixView.tpl:118 -#: templates/default/LSaccessRightsMatrixView.tpl:152 +#: templates/default/LSaccessRightsMatrixView.tpl:65 +#: templates/default/LSaccessRightsMatrixView.tpl:114 +#: templates/default/LSaccessRightsMatrixView.tpl:154 msgid "Legend:" msgstr "Légende :" @@ -2620,29 +2620,35 @@ msgstr "Mot de passe" msgid "Please confirm new password:" msgstr "Merci de confirmer le nouveau mot de passe :" -#: templates/default/LSaccessRightsMatrixView.tpl:21 -#: templates/default/LSaccessRightsMatrixView.tpl:45 -#: templates/default/LSaccessRightsMatrixView.tpl:61 -#: templates/default/LSaccessRightsMatrixView.tpl:81 -#: templates/default/LSaccessRightsMatrixView.tpl:97 +#: templates/default/LSaccessRightsMatrixView.tpl:22 +#: templates/default/LSaccessRightsMatrixView.tpl:27 +#: templates/default/LSaccessRightsMatrixView.tpl:67 +#: templates/default/LSaccessRightsMatrixView.tpl:72 +#: templates/default/LSaccessRightsMatrixView.tpl:93 +#: templates/default/LSaccessRightsMatrixView.tpl:95 +#: templates/default/LSaccessRightsMatrixView_attr_row.tpl:10 +#: templates/default/LSaccessRightsMatrixView_attr_row.tpl:12 msgid "R" msgstr "L" -#: templates/default/LSaccessRightsMatrixView.tpl:23 -#: templates/default/LSaccessRightsMatrixView.tpl:47 -#: templates/default/LSaccessRightsMatrixView.tpl:63 -#: templates/default/LSaccessRightsMatrixView.tpl:83 -#: templates/default/LSaccessRightsMatrixView.tpl:99 +#: templates/default/LSaccessRightsMatrixView.tpl:24 +#: templates/default/LSaccessRightsMatrixView.tpl:28 +#: templates/default/LSaccessRightsMatrixView.tpl:69 +#: templates/default/LSaccessRightsMatrixView.tpl:73 +#: templates/default/LSaccessRightsMatrixView.tpl:89 +#: templates/default/LSaccessRightsMatrixView.tpl:91 +#: templates/default/LSaccessRightsMatrixView_attr_row.tpl:6 +#: templates/default/LSaccessRightsMatrixView_attr_row.tpl:8 msgid "R/W" msgstr "L/É" -#: templates/default/LSaccessRightsMatrixView.tpl:21 -#: templates/default/LSaccessRightsMatrixView.tpl:81 +#: templates/default/LSaccessRightsMatrixView.tpl:22 +#: templates/default/LSaccessRightsMatrixView.tpl:67 msgid "Readable" msgstr "Lecture" -#: templates/default/LSaccessRightsMatrixView.tpl:23 -#: templates/default/LSaccessRightsMatrixView.tpl:83 +#: templates/default/LSaccessRightsMatrixView.tpl:24 +#: templates/default/LSaccessRightsMatrixView.tpl:69 msgid "Readable / Writable" msgstr "Lecture / Écriture" @@ -2650,7 +2656,7 @@ msgstr "Lecture / Écriture" msgid "Refresh my access rights" msgstr "Rafraîchir mes droits d'accès" -#: templates/default/LSaccessRightsMatrixView.tpl:78 +#: templates/default/LSaccessRightsMatrixView.tpl:63 msgid "Relations / Profiles" msgstr "Relations / Profils" @@ -2658,6 +2664,13 @@ msgstr "Relations / Profils" msgid "Result" msgstr "Résultat" +#: templates/default/LSaccessRightsMatrixView.tpl:29 +#: templates/default/LSaccessRightsMatrixView.tpl:74 +#: templates/default/LSaccessRightsMatrixView.tpl:118 +#: templates/default/LSaccessRightsMatrixView.tpl:158 +msgid "Right inherited from all connected users profile" +msgstr "Droit hérité du profile \"Tous les utilisateurs connectés\"" + #: templates/default/base_connected.tpl:6 msgid "Show/hide menu" msgstr "Afficher/cacher le menu" @@ -2666,21 +2679,21 @@ msgstr "Afficher/cacher le menu" msgid "Subject" msgstr "Sujet" -#: templates/default/LSaccessRightsMatrixView.tpl:73 +#: templates/default/LSaccessRightsMatrixView.tpl:58 msgid "Their relations with other objects" msgstr "Leurs relations avec les autres objets" -#: templates/default/LSaccessRightsMatrixView.tpl:142 +#: templates/default/LSaccessRightsMatrixView.tpl:144 msgid "This object type has no configured custom action." msgstr "Ce type d'objet n'a aucune action personnalisée de configurée." -#: templates/default/LSaccessRightsMatrixView.tpl:176 +#: templates/default/LSaccessRightsMatrixView.tpl:184 msgid "This object type has no configured custom search action." msgstr "" "Ce type d'objet n'a aucune action personnalisée sur les recherches de " "configurée." -#: templates/default/LSaccessRightsMatrixView.tpl:108 +#: templates/default/LSaccessRightsMatrixView.tpl:104 msgid "This object type has no configured relation." msgstr "Ce type d'objet n'a aucune relation de configurée." diff --git a/src/lang/ldapsaisie.pot b/src/lang/ldapsaisie.pot index 85d23d98..4e75c2e2 100644 --- a/src/lang/ldapsaisie.pot +++ b/src/lang/ldapsaisie.pot @@ -2134,8 +2134,8 @@ msgstr "" msgid "Mr." msgstr "" -#: templates/default/LSaccessRightsMatrixView.tpl:119 -#: templates/default/LSaccessRightsMatrixView.tpl:153 +#: templates/default/LSaccessRightsMatrixView.tpl:115 +#: templates/default/LSaccessRightsMatrixView.tpl:155 msgid "Allowed" msgstr "" @@ -2155,16 +2155,16 @@ msgstr "" msgid "Connected as" msgstr "" -#: templates/default/LSaccessRightsMatrixView.tpl:111 +#: templates/default/LSaccessRightsMatrixView.tpl:107 msgid "Custom actions" msgstr "" -#: templates/default/LSaccessRightsMatrixView.tpl:116 -#: templates/default/LSaccessRightsMatrixView.tpl:150 +#: templates/default/LSaccessRightsMatrixView.tpl:112 +#: templates/default/LSaccessRightsMatrixView.tpl:152 msgid "Custom actions / Profiles" msgstr "" -#: templates/default/LSaccessRightsMatrixView.tpl:145 +#: templates/default/LSaccessRightsMatrixView.tpl:147 msgid "Custom search actions" msgstr "" @@ -2212,9 +2212,9 @@ msgid "Language" msgstr "" #: templates/default/LSaccessRightsMatrixView.tpl:20 -#: templates/default/LSaccessRightsMatrixView.tpl:80 -#: templates/default/LSaccessRightsMatrixView.tpl:118 -#: templates/default/LSaccessRightsMatrixView.tpl:152 +#: templates/default/LSaccessRightsMatrixView.tpl:65 +#: templates/default/LSaccessRightsMatrixView.tpl:114 +#: templates/default/LSaccessRightsMatrixView.tpl:154 msgid "Legend:" msgstr "" @@ -2262,29 +2262,35 @@ msgstr "" msgid "Please confirm new password:" msgstr "" -#: templates/default/LSaccessRightsMatrixView.tpl:21 -#: templates/default/LSaccessRightsMatrixView.tpl:45 -#: templates/default/LSaccessRightsMatrixView.tpl:61 -#: templates/default/LSaccessRightsMatrixView.tpl:81 -#: templates/default/LSaccessRightsMatrixView.tpl:97 +#: templates/default/LSaccessRightsMatrixView.tpl:22 +#: templates/default/LSaccessRightsMatrixView.tpl:27 +#: templates/default/LSaccessRightsMatrixView.tpl:67 +#: templates/default/LSaccessRightsMatrixView.tpl:72 +#: templates/default/LSaccessRightsMatrixView.tpl:93 +#: templates/default/LSaccessRightsMatrixView.tpl:95 +#: templates/default/LSaccessRightsMatrixView_attr_row.tpl:10 +#: templates/default/LSaccessRightsMatrixView_attr_row.tpl:12 msgid "R" msgstr "" -#: templates/default/LSaccessRightsMatrixView.tpl:23 -#: templates/default/LSaccessRightsMatrixView.tpl:47 -#: templates/default/LSaccessRightsMatrixView.tpl:63 -#: templates/default/LSaccessRightsMatrixView.tpl:83 -#: templates/default/LSaccessRightsMatrixView.tpl:99 +#: templates/default/LSaccessRightsMatrixView.tpl:24 +#: templates/default/LSaccessRightsMatrixView.tpl:28 +#: templates/default/LSaccessRightsMatrixView.tpl:69 +#: templates/default/LSaccessRightsMatrixView.tpl:73 +#: templates/default/LSaccessRightsMatrixView.tpl:89 +#: templates/default/LSaccessRightsMatrixView.tpl:91 +#: templates/default/LSaccessRightsMatrixView_attr_row.tpl:6 +#: templates/default/LSaccessRightsMatrixView_attr_row.tpl:8 msgid "R/W" msgstr "" -#: templates/default/LSaccessRightsMatrixView.tpl:21 -#: templates/default/LSaccessRightsMatrixView.tpl:81 +#: templates/default/LSaccessRightsMatrixView.tpl:22 +#: templates/default/LSaccessRightsMatrixView.tpl:67 msgid "Readable" msgstr "" -#: templates/default/LSaccessRightsMatrixView.tpl:23 -#: templates/default/LSaccessRightsMatrixView.tpl:83 +#: templates/default/LSaccessRightsMatrixView.tpl:24 +#: templates/default/LSaccessRightsMatrixView.tpl:69 msgid "Readable / Writable" msgstr "" @@ -2292,7 +2298,7 @@ msgstr "" msgid "Refresh my access rights" msgstr "" -#: templates/default/LSaccessRightsMatrixView.tpl:78 +#: templates/default/LSaccessRightsMatrixView.tpl:63 msgid "Relations / Profiles" msgstr "" @@ -2300,6 +2306,13 @@ msgstr "" msgid "Result" msgstr "" +#: templates/default/LSaccessRightsMatrixView.tpl:29 +#: templates/default/LSaccessRightsMatrixView.tpl:74 +#: templates/default/LSaccessRightsMatrixView.tpl:118 +#: templates/default/LSaccessRightsMatrixView.tpl:158 +msgid "Right inherited from all connected users profile" +msgstr "" + #: templates/default/base_connected.tpl:6 msgid "Show/hide menu" msgstr "" @@ -2308,19 +2321,19 @@ msgstr "" msgid "Subject" msgstr "" -#: templates/default/LSaccessRightsMatrixView.tpl:73 +#: templates/default/LSaccessRightsMatrixView.tpl:58 msgid "Their relations with other objects" msgstr "" -#: templates/default/LSaccessRightsMatrixView.tpl:142 +#: templates/default/LSaccessRightsMatrixView.tpl:144 msgid "This object type has no configured custom action." msgstr "" -#: templates/default/LSaccessRightsMatrixView.tpl:176 +#: templates/default/LSaccessRightsMatrixView.tpl:184 msgid "This object type has no configured custom search action." msgstr "" -#: templates/default/LSaccessRightsMatrixView.tpl:108 +#: templates/default/LSaccessRightsMatrixView.tpl:104 msgid "This object type has no configured relation." msgstr "" diff --git a/src/templates/default/LSaccessRightsMatrixView.tpl b/src/templates/default/LSaccessRightsMatrixView.tpl index 85e390f6..0e0e2cb4 100644 --- a/src/templates/default/LSaccessRightsMatrixView.tpl +++ b/src/templates/default/LSaccessRightsMatrixView.tpl @@ -17,10 +17,17 @@ {tr msg="Attributes / Profiles"}
- - {tr msg="R"} = {tr msg="Readable"} - | - {tr msg="R/W"} = {tr msg="Readable / Writable"} +

+

+ {tr msg="R"} = {tr msg="Readable"} + | + {tr msg="R/W"} = {tr msg="Readable / Writable"} +

+

+ {tr msg="R"} / + {tr msg="R/W"} + = {tr msg="Right inherited from all connected users profile"} +

{foreach $LSprofiles as $name => $label} @@ -37,34 +44,12 @@ {foreach $tab.attrs as $name} {if !isset($LSobjects[$LSobject]['attrs'][$name])}{continue}{/if} {assign var=conf value=$LSobjects[$LSobject]['attrs'][$name]} - - {$conf.label} ? - {foreach $LSprofiles as $profil => $profil_label} - - {if $conf.rights[$profil] == 'r'} - {tr msg="R"} - {elseif $conf.rights[$profil] == 'w'} - {tr msg="R/W"} - {/if} - - {/foreach} - + {include file='ls:LSaccessRightsMatrixView_attr_row.tpl'} {/foreach} {/foreach} {else} {foreach $LSobjects[$LSobject]['attrs'] as $name => $conf} - - {$conf.label} ? - {foreach $LSprofiles as $profil => $profil_label} - - {if $conf.rights[$profil] == 'r'} - {tr msg="R"} - {elseif $conf.rights[$profil] == 'w'} - {tr msg="R/W"} - {/if} - - {/foreach} - + {include file='ls:LSaccessRightsMatrixView_attr_row.tpl'} {/foreach} {/if} @@ -77,10 +62,17 @@ {tr msg="Relations / Profiles"}
- - {tr msg="R"} = {tr msg="Readable"} - | - {tr msg="R/W"} = {tr msg="Readable / Writable"} +

+

+ {tr msg="R"} = {tr msg="Readable"} + | + {tr msg="R/W"} = {tr msg="Readable / Writable"} +

+

+ {tr msg="R"} / + {tr msg="R/W"} + = {tr msg="Right inherited from all connected users profile"} +

{foreach $LSprofiles as $name => $label} @@ -93,10 +85,14 @@ {$conf.label} ? {foreach $LSprofiles as $profil => $profil_label} - {if $conf.rights[$profil] == 'r'} - {tr msg="R"} - {elseif $conf.rights[$profil] == 'w'} + {if $conf.rights[$profil] == 'w'} {tr msg="R/W"} + {elseif $profil != 'user' && $conf.rights['user'] == 'w'} + {tr msg="R/W"} + {elseif $conf.rights[$profil] == 'r'} + {tr msg="R"} + {elseif $profil != 'user' && $conf.rights['user'] == 'r'} + {tr msg="R"} {/if} {/foreach} @@ -115,8 +111,12 @@ {tr msg="Custom actions / Profiles"}
- - X = {tr msg="Allowed"} +

+

X = {tr msg="Allowed"}

+

+ X + = {tr msg="Right inherited from all connected users profile"} +

{foreach $LSprofiles as $name => $label} @@ -131,6 +131,8 @@ {if $conf.rights[$profil]} X + {elseif $profil != 'user' && $conf.rights['user']} + X {/if} {/foreach} @@ -149,8 +151,12 @@ {tr msg="Custom actions / Profiles"}
- - X = {tr msg="Allowed"} +

+

X = {tr msg="Allowed"}

+

+ X + = {tr msg="Right inherited from all connected users profile"} +

{foreach $LSprofiles as $name => $label} @@ -165,6 +171,8 @@ {if $conf.rights[$profil]} X + {elseif $profil != 'user' && $conf.rights['user']} + X {/if} {/foreach} diff --git a/src/templates/default/LSaccessRightsMatrixView_attr_row.tpl b/src/templates/default/LSaccessRightsMatrixView_attr_row.tpl new file mode 100644 index 00000000..89c2060f --- /dev/null +++ b/src/templates/default/LSaccessRightsMatrixView_attr_row.tpl @@ -0,0 +1,16 @@ + + {$conf.label} ? + {foreach $LSprofiles as $profil => $profil_label} + + {if $conf.rights[$profil] == 'w'} + {tr msg="R/W"} + {elseif $profil != 'user' && $conf.rights['user'] == 'w'} + {tr msg="R/W"} + {elseif $conf.rights[$profil] == 'r'} + {tr msg="R"} + {elseif $profil != 'user' && $conf.rights['user'] == 'r'} + {tr msg="R"} + {/if} + + {/foreach} +