From be79881b174ed5750c294c47a017238d6eb41399 Mon Sep 17 00:00:00 2001 From: rob Date: Thu, 15 May 2003 11:44:19 +0000 Subject: [PATCH] *** empty log message *** --- presentation/lookAndFeel/knowledgeTree/foldermanagement/viewDependantDocumentsBL.php | 7 ++++--- presentation/lookAndFeel/knowledgeTree/foldermanagement/viewDependantDocumentsUI.inc | 31 +++++++++++++++++++++++++++---- 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/viewDependantDocumentsBL.php b/presentation/lookAndFeel/knowledgeTree/foldermanagement/viewDependantDocumentsBL.php index e503e73..f0e3947 100644 --- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/viewDependantDocumentsBL.php +++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/viewDependantDocumentsBL.php @@ -16,6 +16,7 @@ require_once("../../../../config/dmsDefaults.php"); if (checkSession()) { if (isset($fFolderID) && isset($fFolderCollaborationID)) { + echo $fUserID; require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc"); require_once("$default->fileSystemRoot/lib/foldermanagement/FolderCollaboration.inc"); require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc"); @@ -29,8 +30,7 @@ if (checkSession()) { $oFolderCollaboration = FolderCollaboration::get($fFolderCollaborationID); if ($oFolderCollaboration->hasDocumentInProcess()) { //can't add document links if a document is currently undergoing the - //collaboration process - echo "in here"; + //collaboration process } if (isset($fForAdd)) { //we are adding a new dependant document @@ -38,7 +38,8 @@ if (checkSession()) { $oPatternCustom = & new PatternCustom(); $oPatternCustom->setHtml(getAddPage($fFolderCollaborationID, $fFolderID, (isset($fUnitID) ? $fUnitID : -1), (isset($fDocumentTitle) ? $fDocumentTitle : ""))); $main->setCentralPayload($oPatternCustom); - $main->setFormAction("document.MainForm.action = " . $_SERVER["PHP_SELF"] . "?fFolderID=$fFolderID&fFolderCollaborationID=$fFolderCollaborationID&fForAdd=1;document.MainForm.submit();"); + $main->setFormAction($_SERVER["PHP_SELF"] . "?fFolderID=$fFolderID&fFolderCollaborationID=$fFolderCollaborationID&fForStore=1"); + $main->setHasRequiredFields(true); $main->render(); } else { include_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/viewDependantDocumentsUI.inc b/presentation/lookAndFeel/knowledgeTree/foldermanagement/viewDependantDocumentsUI.inc index de34214..6103ed9 100644 --- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/viewDependantDocumentsUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/viewDependantDocumentsUI.inc @@ -82,14 +82,15 @@ function getAddPage($iFolderCollaborationID, $iFolderID, $iUnitID, $sDocumentTit $sToRender .= "User" . getUserDropDown($iUnitID) . "\n"; $sToRender .= "\n"; $sToRender .= "\n"; - $sToRender .= "Template document\n"; + $sToRender .= "Template document\n"; $sToRender .= "\n"; $sToRender .= "\n"; - $sToRender .= "
graphicsUrl/widgets/add.gif\" border=\"0\"/>
\n"; + $sToRender .= "
graphicsUrl/widgets/done.gif\" border=\"0\"/>rootUrl . "\">graphicsUrl/widgets/cancel.gif\" border=\"0\"/>
\n"; $sToRender .= "\n"; - $sToRender .= "\n"; + $sToRender .= "\n"; + $sToRender .= "\n"; - return $sToRender; + return $sToRender . "\n\n" . getValidationJavaScript() . "\n\n" . getBrowseJavaScript(); } function getUserDropDown($iUnitID) { @@ -112,5 +113,27 @@ function getUnitDropDown($iFolderCollaborationID, $iFolderID, $iUnitID) { return $oPatternListBox->render(); } +function getValidationJavaScript() { + $sToRender .= "\n\n\n\n"; + return $sToRender; +} + +function getBrowseJavaScript() { + $sToRender = "\n"; + return $sToRender; +} + + + ?> \ No newline at end of file -- libgit2 0.21.4