Commit af48cb7f7a20f2361d6a36f8dcad27b2a48f0db3
1 parent
1751c5cc
debugged pending collaboration documents retrieve and view
git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@1222 c91229c3-7414-0410-bfa2-8a42b809f60b
Showing
2 changed files
with
4 additions
and
4 deletions
presentation/lookAndFeel/knowledgeTree/dashboardBL.php
| @@ -37,7 +37,7 @@ function getPendingCollaborationDocuments($iUserID) { | @@ -37,7 +37,7 @@ function getPendingCollaborationDocuments($iUserID) { | ||
| 37 | $aDocumentList = array(); | 37 | $aDocumentList = array(); |
| 38 | if ($default->db->query($sQuery)) { | 38 | if ($default->db->query($sQuery)) { |
| 39 | while ($default->db->next_record()) { | 39 | while ($default->db->next_record()) { |
| 40 | - $aDocumentList[] = & Document::get($default->db->f("id")); | 40 | + $aDocumentList[] = & Document::get($default->db->f("document_id")); |
| 41 | } | 41 | } |
| 42 | } | 42 | } |
| 43 | return $aDocumentList; | 43 | return $aDocumentList; |
presentation/lookAndFeel/knowledgeTree/dashboardUI.inc
| @@ -20,14 +20,14 @@ require_once("$default->fileSystemRoot/lib/users/User.inc"); | @@ -20,14 +20,14 @@ require_once("$default->fileSystemRoot/lib/users/User.inc"); | ||
| 20 | * @param array of pending collaboration documents | 20 | * @param array of pending collaboration documents |
| 21 | */ | 21 | */ |
| 22 | function renderPendingCollaborationDocuments($aPendingDocumentList) { | 22 | function renderPendingCollaborationDocuments($aPendingDocumentList) { |
| 23 | + global $default; | ||
| 23 | $sToRender = "\t<tr align=\"left\" bgcolor=\"#996600\">\n"; | 24 | $sToRender = "\t<tr align=\"left\" bgcolor=\"#996600\">\n"; |
| 24 | $sToRender .= "\t\t<th class=\"sectionHeading\" colspan=\"2\">Pending Documents</th>\n"; | 25 | $sToRender .= "\t\t<th class=\"sectionHeading\" colspan=\"2\">Pending Documents</th>\n"; |
| 25 | $sToRender .= "\t</tr>\n"; | 26 | $sToRender .= "\t</tr>\n"; |
| 26 | for ($i = 0; $i < count($aPendingDocumentList); $i++) { | 27 | for ($i = 0; $i < count($aPendingDocumentList); $i++) { |
| 27 | $oDocument = $aPendingDocumentList[$i]; | 28 | $oDocument = $aPendingDocumentList[$i]; |
| 28 | $sToRender .= "\t<tr>\n"; | 29 | $sToRender .= "\t<tr>\n"; |
| 29 | - //$sToRender .= "<td nowrap >" . $aPendingDocumentList[$i]->getTitleLink() . "</td>\n"; | ||
| 30 | - $sToRender .= "<td nowrap colspan=\"2\">" . generateControllerLink("viewDocument", "fDocumentID=" . $oDocument->getID(), $oDocument->getDisplayPath()) . "</td>\n"; | 30 | + $sToRender .= "<td nowrap colspan=\"2\">" . generateControllerLink("viewDocument", "fDocumentID=" . $oDocument->getID(), "<img src=\"$default->graphicsUrl/widgets/dstatus.gif\" border=\"0\"/>" . $oDocument->getDisplayPath()) . "</td>\n"; |
| 31 | $sToRender .= "\t</tr>\n"; | 31 | $sToRender .= "\t</tr>\n"; |
| 32 | } | 32 | } |
| 33 | return $sToRender; | 33 | return $sToRender; |
| @@ -56,7 +56,7 @@ function renderCheckedOutDocuments($aCheckedOutDocumentList) { | @@ -56,7 +56,7 @@ function renderCheckedOutDocuments($aCheckedOutDocumentList) { | ||
| 56 | for ($i = 0; $i < count($aCheckedOutDocumentList); $i++) { | 56 | for ($i = 0; $i < count($aCheckedOutDocumentList); $i++) { |
| 57 | $oDocument = $aCheckedOutDocumentList[$i]; | 57 | $oDocument = $aCheckedOutDocumentList[$i]; |
| 58 | $sToRender .= "\t<tr>\n"; | 58 | $sToRender .= "\t<tr>\n"; |
| 59 | - $sToRender .= "<td nowrap>" . generateControllerLink("viewDocument", "fDocumentID=" . $oDocument->getID(), "<img src=\"$default->graphicsUrl/widgets/dstatus.gif\" border=\"0\"/>" . $oDocument->getDisplayPath()) . "</td>\n"; | 59 | + $sToRender .= "<td nowrap>" . generateControllerLink("viewDocument", "fDocumentID=" . $oDocument->getID(), $oDocument->getDisplayPath()) . "</td>\n"; |
| 60 | $sToRender .= "<td>" . $oDocument->getDaysSinceLastModified() . "</td>\n"; | 60 | $sToRender .= "<td>" . $oDocument->getDaysSinceLastModified() . "</td>\n"; |
| 61 | $sToRender .= "\t</tr>\n"; | 61 | $sToRender .= "\t</tr>\n"; |
| 62 | } | 62 | } |