Commit 25788e68f9182c9b8fb3b0dd19bdd651ef4e97f9
1 parent
8ac8ec9c
make permissions use the new dispatcher-persistence stuff.
git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@5826 c91229c3-7414-0410-bfa2-8a42b809f60b
Showing
2 changed files
with
6 additions
and
6 deletions
templates/ktcore/folder/permissions.smarty
| @@ -10,8 +10,8 @@ | @@ -10,8 +10,8 @@ | ||
| 10 | {else} | 10 | {else} |
| 11 | 11 | ||
| 12 | {* otherwise continue *} | 12 | {* otherwise continue *} |
| 13 | -<p>{i18n}Manage security{/i18n}: <a href="{addQS}fFolderId={$iFolderId}{/addQS}">{i18n}View permissions overview{/i18n}</a> | ||
| 14 | -| <a href="{addQS}action=resolved_users&fFolderId={$iFolderId}{/addQS}">{i18n}View resolved permissions for user{/i18n}</a> | 13 | +<p>{i18n}Manage security{/i18n}: <a href="{addQS context=$context}{/addQS}">{i18n}View permissions overview{/i18n}</a> |
| 14 | +| <a href="{addQS context=$context}action=resolved_users{/addQS}">{i18n}View resolved permissions for user{/i18n}</a> | ||
| 15 | </p> | 15 | </p> |
| 16 | 16 | ||
| 17 | {if ($can_inherit)} | 17 | {if ($can_inherit)} |
| @@ -19,7 +19,7 @@ | @@ -19,7 +19,7 @@ | ||
| 19 | <p>{i18n}This folder defines its own permissions.{/i18n} | 19 | <p>{i18n}This folder defines its own permissions.{/i18n} |
| 20 | <a class="ktActionLink ktDelete" | 20 | <a class="ktActionLink ktDelete" |
| 21 | kt:deleteMessage="Are you sure you wish to reinstate inherited permissions?" | 21 | kt:deleteMessage="Are you sure you wish to reinstate inherited permissions?" |
| 22 | - href="{addQS}action=inheritPermissions&fFolderId={$iFolderId}{/addQS}">{i18n}Inherit permissions{/i18n}</a> | 22 | + href="{addQS context=$context}action=inheritPermissions{/addQS}">{i18n}Inherit permissions{/i18n}</a> |
| 23 | </div> | 23 | </div> |
| 24 | {/if} | 24 | {/if} |
| 25 | 25 |
templates/ktcore/folder/view_permissions.smarty
| @@ -5,10 +5,10 @@ this specific folder. Only the roles or groups which have permissions | @@ -5,10 +5,10 @@ this specific folder. Only the roles or groups which have permissions | ||
| 5 | assigned are shown.{/i18n}</p> | 5 | assigned are shown.{/i18n}</p> |
| 6 | 6 | ||
| 7 | {if $edit} | 7 | {if $edit} |
| 8 | -{i18n}Manage security{/i18n}: <a href="{addQS}action=edit&fFolderId={$oFolder->getId()}{/addQS}">{i18n}Edit permissions{/i18n}</a> | ||
| 9 | -| <a href="{addQS}action=resolved_users&fFolderId={$oFolder->getId()}{/addQS}">{i18n}View resolved permissions for user{/i18n}</a> | 8 | +{i18n}Manage security{/i18n}: <a href="{addQS context=$context}action=edit{/addQS}">{i18n}Edit permissions{/i18n}</a> |
| 9 | +| <a href="{addQS context=$context}action=resolved_users{/addQS}">{i18n}View resolved permissions for user{/i18n}</a> | ||
| 10 | {else} | 10 | {else} |
| 11 | -{i18n}Manage security{/i18n}: <a href="{addQS}action=resolved_users&fFolderId={$oFolder->getId()}{/addQS}">{i18n}View resolved permissions for user{/i18n}</a> | 11 | +{i18n}Manage security{/i18n}: <a href="{addQS}action=resolved_users{/addQS}">{i18n}View resolved permissions for user{/i18n}</a> |
| 12 | {/if} | 12 | {/if} |
| 13 | 13 | ||
| 14 | 14 |