From e0b473f8a4ef3760edff4b3e5d9f65611dca59b9 Mon Sep 17 00:00:00 2001
From: Michael Joseph <michael@knowledgetree.com>
Date: Wed, 28 May 2003 10:43:37 +0000
Subject: [PATCH] updated to use document status checking methods

---
 lib/browse/CategoryBrowser.inc                                       |  2 +-
 lib/browse/DocumentTypeBrowser.inc                                   |  2 +-
 lib/browse/FolderBrowser.inc                                         |  2 +-
 presentation/lookAndFeel/knowledgeTree/documentmanagement/viewBL.php | 41 ++++++++++++++++++++---------------------
 4 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/lib/browse/CategoryBrowser.inc b/lib/browse/CategoryBrowser.inc
index ecbd32e..63b04bc 100644
--- a/lib/browse/CategoryBrowser.inc
+++ b/lib/browse/CategoryBrowser.inc
@@ -91,7 +91,7 @@ class CategoryBrowser extends Browser {
                 // check permissions
                 if (Permission::userHasDocumentReadPermission($sql->f("document_id"))) {
                 	$oDocument = & Document::get($sql->f("document_id"));
-                    if ($oDocument->getStatusID() == lookupStatusID("Live")) {
+                    if ($oDocument->isLive()) {
                     	$results["documents"][] = $oDocument;
                     } 
                 } else {
diff --git a/lib/browse/DocumentTypeBrowser.inc b/lib/browse/DocumentTypeBrowser.inc
index 3792f59..3ca14d5 100644
--- a/lib/browse/DocumentTypeBrowser.inc
+++ b/lib/browse/DocumentTypeBrowser.inc
@@ -81,7 +81,7 @@ class DocumentTypeBrowser extends Browser {
                 // check permission
                 if (Permission::userHasDocumentReadPermission($sql->f("id"))) {
                 	$oDocument = & Document::get($sql->f("id"));
-                    if ($oDocument->getStatusID() == lookupStatusID("Live")) {
+                    if ($oDocument->isLive()) {
                     	$results["documents"][] = $oDocument;
                     }
                 } else {
diff --git a/lib/browse/FolderBrowser.inc b/lib/browse/FolderBrowser.inc
index dd403fd..b81c62e 100644
--- a/lib/browse/FolderBrowser.inc
+++ b/lib/browse/FolderBrowser.inc
@@ -121,7 +121,7 @@ class FolderBrowser extends Browser {
                         // add documents to array
                         // set file attributes
                         $oDocument = & Document::get($sql->f("id"));
-                        if ($oDocument->getStatusID() == lookupStatusID("Live")) {
+                        if ($oDocument->isLive()) {
                         	$results["documents"][] = $oDocument;
                         } 
                     } else {
diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewBL.php b/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewBL.php
index 6714c36..1a45efc 100644
--- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewBL.php
@@ -1,24 +1,23 @@
 <?php
 /**
-* documentViewUI.php
-* Contains the business logic required to build the document view page.
-* Will use documentViewUI.php for HTML
-*
-* Expected form varaibles:
-*   o $fDocumentID - Primary key of document to view
-*
-* Optional form variables:
-*   o fCollaborationEdit - the user attempted to edit a collaboration step that is currently active 
-*   o fForDownload - the user is attempting to download the document
-*   o fBeginCollaboration - the user selected the 'Begin Collaboration' button
-*   o fFireSubscription - the document has been modified, and a subscription alert must be fired
-*
-*
-* @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
-* @date 21 January 2003
-* @package presentation.lookAndFeel.knowledgeTree.documentManager
-*/
-
+ * $Id$
+ * Contains the business logic required to build the document view page.
+ * Will use documentViewUI.php for HTML
+ *
+ * Expected form varaibles:
+ *   o $fDocumentID - Primary key of document to view
+ *
+ * Optional form variables:
+ *   o fCollaborationEdit - the user attempted to edit a collaboration step that is currently active 
+ *   o fForDownload - the user is attempting to download the document
+ *   o fBeginCollaboration - the user selected the 'Begin Collaboration' button
+ *   o fFireSubscription - the document has been modified, and a subscription alert must be fired
+ *
+ *
+ * @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
+ * @date 21 January 2003
+ * @package presentation.lookAndFeel.knowledgeTree.documentManager
+ */
 
 require_once("../../../../config/dmsDefaults.php");
 
@@ -225,13 +224,13 @@ if (checkSession()) {
             }
             
             $oPatternCustom = & new PatternCustom();
-            if ($oDocument->getStatusID() == lookupStatusID("Live")) {
+            if ($oDocument->isLive()) {
 	            if (Permission::userHasDocumentWritePermission($fDocumentID)) {
 	                $oPatternCustom->setHtml(getEditPage($oDocument));
 	            } else if (Permission::userHasDocumentReadPermission($fDocumentID)) {
 	                $oPatternCustom->setHtml(getViewPage($oDocument));
 	            }
-            } else if ($oDocument->getStatusID() == lookupStatusID("Archived")) {
+            } else if ($oDocument->isArchived()) {
             	// cancel
 	            $oPatternCustom->setHtml("<a href=\"" . generateControllerLink("browse", "fFolderID=" . $oDocument->getFolderID()) . "\"><img src=\"$default->graphicsUrl/widgets/back.gif\" border=\"0\" /></a>\n");
 	            $main->setErrorMessage("This document has been archived.");
--
libgit2 0.21.4