Commit 490aead73fd902dda65975be3f606e5d8c1ba553
1 parent
c0e290c6
add folder name to upload, import and role allocation, per KTS-1144 and KTS-1145
git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@5701 c91229c3-7414-0410-bfa2-8a42b809f60b
Showing
6 changed files
with
8 additions
and
1 deletions
plugins/ktcore/KTPermissions.php
| @@ -387,6 +387,7 @@ class KTRoleAllocationPlugin extends KTFolderAction { | @@ -387,6 +387,7 @@ class KTRoleAllocationPlugin extends KTFolderAction { | ||
| 387 | $aTemplateData = array( | 387 | $aTemplateData = array( |
| 388 | 'context' => &$this, | 388 | 'context' => &$this, |
| 389 | 'roles' => $aRoles, | 389 | 'roles' => $aRoles, |
| 390 | + 'foldername' => $this->oFolder->getName(), | ||
| 390 | ); | 391 | ); |
| 391 | return $oTemplate->render($aTemplateData); | 392 | return $oTemplate->render($aTemplateData); |
| 392 | } | 393 | } |
plugins/ktcore/folder/BulkImport.php
| @@ -84,6 +84,7 @@ class KTBulkImportFolderAction extends KTFolderAction { | @@ -84,6 +84,7 @@ class KTBulkImportFolderAction extends KTFolderAction { | ||
| 84 | 'context' => &$this, | 84 | 'context' => &$this, |
| 85 | 'add_fields' => $add_fields, | 85 | 'add_fields' => $add_fields, |
| 86 | 'generic_fieldsets' => $fieldsets, | 86 | 'generic_fieldsets' => $fieldsets, |
| 87 | + 'foldername' => $this->oFolder->getName(), | ||
| 87 | )); | 88 | )); |
| 88 | return $oTemplate->render(); | 89 | return $oTemplate->render(); |
| 89 | } | 90 | } |
plugins/ktcore/folder/BulkUpload.php
| @@ -90,6 +90,7 @@ class KTBulkUploadFolderAction extends KTFolderAction { | @@ -90,6 +90,7 @@ class KTBulkUploadFolderAction extends KTFolderAction { | ||
| 90 | 'context' => &$this, | 90 | 'context' => &$this, |
| 91 | 'add_fields' => $add_fields, | 91 | 'add_fields' => $add_fields, |
| 92 | 'generic_fieldsets' => $fieldsets, | 92 | 'generic_fieldsets' => $fieldsets, |
| 93 | + 'foldername' => $this->oFolder->getName(), | ||
| 93 | )); | 94 | )); |
| 94 | return $oTemplate->render(); | 95 | return $oTemplate->render(); |
| 95 | } | 96 | } |
templates/ktcore/folder/bulkImport.smarty
| @@ -54,6 +54,8 @@ addLoadEvent(startupMetadata); | @@ -54,6 +54,8 @@ addLoadEvent(startupMetadata); | ||
| 54 | {/capture} | 54 | {/capture} |
| 55 | {$context->oPage->requireJSStandalone($sJavascript)} | 55 | {$context->oPage->requireJSStandalone($sJavascript)} |
| 56 | 56 | ||
| 57 | +<h2>{i18n arg_foldername=$foldername}Import files into "#foldername#"{/i18n}</h2> | ||
| 58 | + | ||
| 57 | <form method="POST" action="{$smarty.server.PHP_SELF}" enctype="multipart/form-data"> | 59 | <form method="POST" action="{$smarty.server.PHP_SELF}" enctype="multipart/form-data"> |
| 58 | <fieldset><legend>{i18n}Import from Server Location{/i18n}</legend> | 60 | <fieldset><legend>{i18n}Import from Server Location{/i18n}</legend> |
| 59 | <p class="descriptiveText">{i18n}The bulk import facility allows for a number | 61 | <p class="descriptiveText">{i18n}The bulk import facility allows for a number |
templates/ktcore/folder/bulkUpload.smarty
| @@ -54,6 +54,8 @@ addLoadEvent(startupMetadata); | @@ -54,6 +54,8 @@ addLoadEvent(startupMetadata); | ||
| 54 | {/capture} | 54 | {/capture} |
| 55 | {$context->oPage->requireJSStandalone($sJavascript)} | 55 | {$context->oPage->requireJSStandalone($sJavascript)} |
| 56 | 56 | ||
| 57 | +<h2>{i18n arg_foldername=$foldername}Upload files into "#foldername#"{/i18n}</h2> | ||
| 58 | + | ||
| 57 | <form method="POST" action="{$smarty.server.PHP_SELF|addQueryString:"postExpected=1&fFolderId="}{$context->oFolder->getId()}" enctype="multipart/form-data"> | 59 | <form method="POST" action="{$smarty.server.PHP_SELF|addQueryString:"postExpected=1&fFolderId="}{$context->oFolder->getId()}" enctype="multipart/form-data"> |
| 58 | <fieldset><legend>{i18n}Bulk import{/i18n}</legend> | 60 | <fieldset><legend>{i18n}Bulk import{/i18n}</legend> |
| 59 | <p class="descriptiveText">{i18n}The bulk upload facility allows for a number | 61 | <p class="descriptiveText">{i18n}The bulk upload facility allows for a number |
templates/ktcore/folder/roles.smarty
| 1 | -<h2>{i18n}Allocate Roles{/i18n}</h2> | 1 | +<h2>{i18n arg_foldername=$foldername}Allocate Roles for "#foldername#"{/i18n}</h2> |
| 2 | 2 | ||
| 3 | <p class="descriptiveText">{i18n} | 3 | <p class="descriptiveText">{i18n} |
| 4 | In many cases, workflow actions will be assigned to certain <strong>roles</strong> | 4 | In many cases, workflow actions will be assigned to certain <strong>roles</strong> |