Commit 6f9d420f126c9f619c8d1837430d8978a43b7c2b

Authored by Neil Blakey-Milner
1 parent 8b7301d2

Automatically enter edit mode on the edit page.


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@5318 c91229c3-7414-0410-bfa2-8a42b809f60b
plugins/ktcore/folder/Permissions.php
@@ -181,6 +181,9 @@ class KTFolderPermissionsAction extends KTFolderAction { @@ -181,6 +181,9 @@ class KTFolderPermissionsAction extends KTFolderAction {
181 $oTemplating =& KTTemplating::getSingleton(); 181 $oTemplating =& KTTemplating::getSingleton();
182 $oTemplate = $oTemplating->loadTemplate("ktcore/folder/permissions"); 182 $oTemplate = $oTemplating->loadTemplate("ktcore/folder/permissions");
183 $oPO = KTPermissionObject::get($this->oFolder->getPermissionObjectId()); 183 $oPO = KTPermissionObject::get($this->oFolder->getPermissionObjectId());
  184 + $aOptions = array('redirect_to' => array('main', 'fFolderId=' . $this->oFolder->getId()));
  185 + $this->oValidator->userHasPermissionOnItem($this->oUser, $this->_sEditShowPermission, $this->oFolder, $aOptions);
  186 +
184 $aPermissions = KTPermission::getList(); 187 $aPermissions = KTPermission::getList();
185 $aMapPermissionGroup = array(); 188 $aMapPermissionGroup = array();
186 $aMapPermissionRole = array(); 189 $aMapPermissionRole = array();
@@ -204,8 +207,6 @@ class KTFolderPermissionsAction extends KTFolderAction { @@ -204,8 +207,6 @@ class KTFolderPermissionsAction extends KTFolderAction {
204 } 207 }
205 208
206 $bEdit = true; 209 $bEdit = true;
207 - $edit_mode = KTUtil::arrayGet($_REQUEST, 'edit_mode', false);  
208 - if ($edit_mode == false) { $bEdit = false; }  
209 210
210 $oInherited = KTPermissionUtil::findRootObjectForPermissionObject($oPO); 211 $oInherited = KTPermissionUtil::findRootObjectForPermissionObject($oPO);
211 // This is fine, since a folder can only inherit permissions 212 // This is fine, since a folder can only inherit permissions
templates/ktcore/folder/view_permissions.smarty
@@ -108,11 +108,5 @@ value="{$iGroupId}"></td> @@ -108,11 +108,5 @@ value="{$iGroupId}"></td>
108 108
109 </tbody> 109 </tbody>
110 </table> 110 </table>
111 -{if $edit}  
112 -<div class="form_actions">  
113 - <input type="submit" value="{i18n}Update Permission Assignments{/i18n}" />  
114 -</div>  
115 -</form>  
116 -{/if}  
117 { /if } 111 { /if }
118 112