diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/checkInDocumentBL.php b/presentation/lookAndFeel/knowledgeTree/documentmanagement/checkInDocumentBL.php index 568a741..7124d00 100644 --- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/checkInDocumentBL.php +++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/checkInDocumentBL.php @@ -37,6 +37,7 @@ if (checkSession()) { require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListFromQuery.inc"); require_once("$default->fileSystemRoot/lib/visualpatterns/PatternTableSqlQuery.inc"); + require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/documentmanagement/checkInDocumentUI.inc"); require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/documentmanagement/documentUI.inc"); require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewUI.inc"); require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc"); @@ -116,11 +117,11 @@ if (checkSession()) { } } else { $sErrorMessage = "Please select a document by first clicking on 'Browse'. Then click 'Check-In'"; - $oPatternCustom->setHtml(getCheckInEditPage($oDocument)); + $oPatternCustom->setHtml(getCheckInPage($oDocument)); } } else { // prompt the user for a check in comment and the file - $oPatternCustom->setHtml(getCheckInEditPage($oDocument)); + $oPatternCustom->setHtml(getCheckInPage($oDocument)); } } else { // you don't have this doc checked out diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/checkOutDocumentBL.php b/presentation/lookAndFeel/knowledgeTree/documentmanagement/checkOutDocumentBL.php index 691ff51..3b0f89a 100644 --- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/checkOutDocumentBL.php +++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/checkOutDocumentBL.php @@ -25,6 +25,7 @@ if (checkSession()) { require_once("$default->fileSystemRoot/lib/documentmanagement/PhysicalDocumentManager.inc"); require_once("$default->fileSystemRoot/lib/documentmanagement/DocumentTransaction.inc"); require_once("$default->fileSystemRoot/lib/documentmanagement/Document.inc"); + require_once("$default->fileSystemRoot/lib/documentmanagement/DocumentCollaboration.inc"); require_once("$default->fileSystemRoot/lib/foldermanagement/FolderCollaboration.inc"); require_once("$default->fileSystemRoot/lib/foldermanagement/FolderUserRole.inc"); @@ -37,6 +38,7 @@ if (checkSession()) { require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListFromQuery.inc"); require_once("$default->fileSystemRoot/lib/visualpatterns/PatternTableSqlQuery.inc"); + require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/documentmanagement/checkOutDocumentUI.inc"); require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/documentmanagement/documentUI.inc"); require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewUI.inc"); require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc"); @@ -78,8 +80,7 @@ if (checkSession()) { $default->log->info("checkOutDocumentBL.php fired $count subscription alerts for checked out document " . $oDocument->getName()); // display checkout success message in the document view page - $oPatternCustom->setHtml(getCheckOutEditPage($oDocument, true)); - + $oPatternCustom->setHtml(getCheckOutPage($oDocument, true)); } else { // document update failed @@ -87,7 +88,7 @@ if (checkSession()) { } } else { // prompt the user for a checkout comment - $oPatternCustom->setHtml(getCheckOutEditPage($oDocument)); + $oPatternCustom->setHtml(getCheckOutPage($oDocument)); } } else { // this document is already checked out @@ -109,9 +110,10 @@ if (checkSession()) { $oPatternCustom->setHtml(renderErrorPage("No document is currently selected for check out")); } + require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); $main->setCentralPayload($oPatternCustom); $main->setFormAction($_SERVER["PHP_SELF"]); $main->render(); } -?> +?> \ No newline at end of file