From db075613b6bb2dccea14fb6452e6c2c357db6ff5 Mon Sep 17 00:00:00 2001 From: michael Date: Fri, 13 Jun 2003 15:10:13 +0000 Subject: [PATCH] added document path heading --- presentation/lookAndFeel/knowledgeTree/documentmanagement/archiving/addArchiveSettingsBL.php | 28 +++++++++++++--------------- presentation/lookAndFeel/knowledgeTree/documentmanagement/archiving/archiveSettingsUI.inc | 4 +++- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/archiving/addArchiveSettingsBL.php b/presentation/lookAndFeel/knowledgeTree/documentmanagement/archiving/addArchiveSettingsBL.php index e458e56..b2085ce 100644 --- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/archiving/addArchiveSettingsBL.php +++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/archiving/addArchiveSettingsBL.php @@ -1,5 +1,15 @@ , Jam Warehouse (Pty) Ltd, South Africa + * @package presentation.lookAndFeel.knowledgeTree.documentmanagement + */ require_once("../../../../../config/dmsDefaults.php"); require_once("$default->fileSystemRoot/lib/documentmanagement/Document.inc"); @@ -13,18 +23,6 @@ require_once("$default->uiDirectory/documentmanagement/documentUI.inc"); require_once("$default->uiDirectory/documentmanagement/archiving/archiveSettingsUI.inc"); require_once("$default->fileSystemRoot/presentation/Html.inc"); -/** - * $Id$ - * - * Business logic for setting document archive settings - * - * Licensed under the GNU GPL. For full terms see the file DOCS/COPYING. - * - * @version $Revision$ - * @author Michael Joseph , Jam Warehouse (Pty) Ltd, South Africa - * @package presentation.lookAndFeel.knowledgeTree.documentmanagement - */ - if (checkSession()) { global $default; @@ -46,10 +44,10 @@ if (checkSession()) { } elseif (isset($fArchivingTypeID)) { // the archiving type has been chosen, so display the correct form - $oContent->setHtml(renderAddArchiveSettingsPage($fArchivingTypeID)); + $oContent->setHtml(renderAddArchiveSettingsPage($fDocumentID, $fArchivingTypeID)); } else { // display the select archiving type page - $oContent->setHtml(renderAddArchiveSettingsPage(null)); + $oContent->setHtml(renderAddArchiveSettingsPage($fDocumentID)); } // build the page diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/archiving/archiveSettingsUI.inc b/presentation/lookAndFeel/knowledgeTree/documentmanagement/archiving/archiveSettingsUI.inc index ebf673b..f2582c8 100644 --- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/archiving/archiveSettingsUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/archiving/archiveSettingsUI.inc @@ -210,6 +210,7 @@ function renderEditArchiveSettingsPage($oDocumentArchiving, $sErrorMessage = "") global $default; $sToRender .= renderHeading("Edit Document Archive Settings"); + $sToRender .= displayDocumentPath($oDocumentArchiving->getDocumentID()); if (strlen($sErrorMessage) > 0) { $sToRender .= renderErrorMessage($sErrorMessage); } @@ -222,10 +223,11 @@ function renderEditArchiveSettingsPage($oDocumentArchiving, $sErrorMessage = "") /** * Displays the add document archive settings page */ -function renderAddArchiveSettingsPage($iArchivingTypeID, $sErrorMessage = "") { +function renderAddArchiveSettingsPage($iDocumentID, $iArchivingTypeID = false, $sErrorMessage = "") { global $default; $sToRender .= renderHeading("Add Document Archive Settings"); + $sToRender .= displayDocumentPath($iDocumentID); if (strlen($sErrorMessage) > 0) { $sToRender .= renderErrorMessage($sErrorMessage); } -- libgit2 0.21.4