Commit 030ac406cbea0e28772da8bba5f8a5ac9fb537ed
1 parent
c69646c0
fix for KTS-471
fix for missing underline on download column header in IE. git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@4995 c91229c3-7414-0410-bfa2-8a42b809f60b
Showing
3 changed files
with
4 additions
and
2 deletions
lib/browse/BrowseColumns.inc.php
| @@ -343,7 +343,7 @@ class WorkflowColumn extends BrowseColumn { | @@ -343,7 +343,7 @@ class WorkflowColumn extends BrowseColumn { | ||
| 343 | class DownloadColumn extends BrowseColumn { | 343 | class DownloadColumn extends BrowseColumn { |
| 344 | 344 | ||
| 345 | function renderHeader($sReturnURL) { | 345 | function renderHeader($sReturnURL) { |
| 346 | - $text = $this->label; | 346 | + $text = ' '; |
| 347 | 347 | ||
| 348 | return $text; | 348 | return $text; |
| 349 | } | 349 | } |
lib/documentmanagement/documentutil.inc.php
| @@ -560,6 +560,8 @@ class KTDocumentUtil { | @@ -560,6 +560,8 @@ class KTDocumentUtil { | ||
| 560 | } | 560 | } |
| 561 | if (PEAR::isError($oDocument) || ($oDocument == false)) { return PEAR::raiseError('Invalid document object.'); } | 561 | if (PEAR::isError($oDocument) || ($oDocument == false)) { return PEAR::raiseError('Invalid document object.'); } |
| 562 | 562 | ||
| 563 | + if ($oDocument->getIsCheckedOut() == true) { return PEAR::raiseError(sprintf(_('The document is checked out and cannot be deleted: %s'), $oDocument->getName())); } | ||
| 564 | + | ||
| 563 | // IF we're deleted ... | 565 | // IF we're deleted ... |
| 564 | if ($oDocument->getStatusID() == DELETED) { return true; } | 566 | if ($oDocument->getStatusID() == DELETED) { return true; } |
| 565 | 567 |
lib/foldermanagement/folderutil.inc.php
| @@ -233,7 +233,7 @@ class KTFolderUtil { | @@ -233,7 +233,7 @@ class KTFolderUtil { | ||
| 233 | // child documents | 233 | // child documents |
| 234 | $aChildDocs = Document::getList(array('folder_id = ?',array($iFolderId))); | 234 | $aChildDocs = Document::getList(array('folder_id = ?',array($iFolderId))); |
| 235 | foreach ($aChildDocs as $oDoc) { | 235 | foreach ($aChildDocs as $oDoc) { |
| 236 | - if ($bIgnorePermissions || KTPermissionUtil::userHasPermissionOnItem($oUser, $oPerm, $oFolder)) { | 236 | + if ($bIgnorePermissions || (KTPermissionUtil::userHasPermissionOnItem($oUser, $oPerm, $oDoc) && ($oDoc->getIsCheckedOut() == false)) ) { |
| 237 | $aDocuments[] = $oDoc; | 237 | $aDocuments[] = $oDoc; |
| 238 | } else { | 238 | } else { |
| 239 | $aFailedDocuments[] = $oDoc->getName(); | 239 | $aFailedDocuments[] = $oDoc->getName(); |