Peter M. Groen / knowledgetree

Commit db075613b6bb2dccea14fb6452e6c2c357db6ff5

Authored by michael
1 parent e481e7c9

added document path heading 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@2174 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 2 changed files with 16 additions and 16 deletions
presentation/lookAndFeel/knowledgeTree/documentmanagement/archiving/addArchiveSettingsBL.php
  View file @db07561
1 <?php 1 <?php
2 - 2 +/**
  3 + * $Id$
  4 + *
  5 + * Business logic for setting document archive settings
  6 + *
  7 + * Licensed under the GNU GPL. For full terms see the file DOCS/COPYING.
  8 + *
  9 + * @version $Revision$
  10 + * @author Michael Joseph <michael@jamwarehouse.com>, Jam Warehouse (Pty) Ltd, South Africa
  11 + * @package presentation.lookAndFeel.knowledgeTree.documentmanagement
  12 + */
3 require_once("../../../../../config/dmsDefaults.php"); 13 require_once("../../../../../config/dmsDefaults.php");
4 require_once("$default->fileSystemRoot/lib/documentmanagement/Document.inc"); 14 require_once("$default->fileSystemRoot/lib/documentmanagement/Document.inc");
5 15
@@ -13,18 +23,6 @@ require_once(&quot;$default-&gt;uiDirectory/documentmanagement/documentUI.inc&quot;); @@ -13,18 +23,6 @@ require_once(&quot;$default-&gt;uiDirectory/documentmanagement/documentUI.inc&quot;);
13 require_once("$default->uiDirectory/documentmanagement/archiving/archiveSettingsUI.inc"); 23 require_once("$default->uiDirectory/documentmanagement/archiving/archiveSettingsUI.inc");
14 require_once("$default->fileSystemRoot/presentation/Html.inc"); 24 require_once("$default->fileSystemRoot/presentation/Html.inc");
15 25
16 -/**  
17 - * $Id$  
18 - *  
19 - * Business logic for setting document archive settings  
20 - *  
21 - * Licensed under the GNU GPL. For full terms see the file DOCS/COPYING.  
22 - *  
23 - * @version $Revision$  
24 - * @author Michael Joseph <michael@jamwarehouse.com>, Jam Warehouse (Pty) Ltd, South Africa  
25 - * @package presentation.lookAndFeel.knowledgeTree.documentmanagement  
26 - */  
27 -  
28 if (checkSession()) { 26 if (checkSession()) {
29 global $default; 27 global $default;
30 28
@@ -46,10 +44,10 @@ if (checkSession()) { @@ -46,10 +44,10 @@ if (checkSession()) {
46 44
47 } elseif (isset($fArchivingTypeID)) { 45 } elseif (isset($fArchivingTypeID)) {
48 // the archiving type has been chosen, so display the correct form 46 // the archiving type has been chosen, so display the correct form
49 - $oContent->setHtml(renderAddArchiveSettingsPage($fArchivingTypeID)); 47 + $oContent->setHtml(renderAddArchiveSettingsPage($fDocumentID, $fArchivingTypeID));
50 } else { 48 } else {
51 // display the select archiving type page 49 // display the select archiving type page
52 - $oContent->setHtml(renderAddArchiveSettingsPage(null)); 50 + $oContent->setHtml(renderAddArchiveSettingsPage($fDocumentID));
53 } 51 }
54 52
55 // build the page 53 // build the page
presentation/lookAndFeel/knowledgeTree/documentmanagement/archiving/archiveSettingsUI.inc
  View file @db07561
@@ -210,6 +210,7 @@ function renderEditArchiveSettingsPage($oDocumentArchiving, $sErrorMessage = &quot;&quot;) @@ -210,6 +210,7 @@ function renderEditArchiveSettingsPage($oDocumentArchiving, $sErrorMessage = &quot;&quot;)
210 global $default; 210 global $default;
211 211
212 $sToRender .= renderHeading("Edit Document Archive Settings"); 212 $sToRender .= renderHeading("Edit Document Archive Settings");
  213 + $sToRender .= displayDocumentPath($oDocumentArchiving->getDocumentID());
213 if (strlen($sErrorMessage) > 0) { 214 if (strlen($sErrorMessage) > 0) {
214 $sToRender .= renderErrorMessage($sErrorMessage); 215 $sToRender .= renderErrorMessage($sErrorMessage);
215 } 216 }
@@ -222,10 +223,11 @@ function renderEditArchiveSettingsPage($oDocumentArchiving, $sErrorMessage = &quot;&quot;) @@ -222,10 +223,11 @@ function renderEditArchiveSettingsPage($oDocumentArchiving, $sErrorMessage = &quot;&quot;)
222 /** 223 /**
223 * Displays the add document archive settings page 224 * Displays the add document archive settings page
224 */ 225 */
225 -function renderAddArchiveSettingsPage($iArchivingTypeID, $sErrorMessage = "") { 226 +function renderAddArchiveSettingsPage($iDocumentID, $iArchivingTypeID = false, $sErrorMessage = "") {
226 global $default; 227 global $default;
227 228
228 $sToRender .= renderHeading("Add Document Archive Settings"); 229 $sToRender .= renderHeading("Add Document Archive Settings");
  230 + $sToRender .= displayDocumentPath($iDocumentID);
229 if (strlen($sErrorMessage) > 0) { 231 if (strlen($sErrorMessage) > 0) {
230 $sToRender .= renderErrorMessage($sErrorMessage); 232 $sToRender .= renderErrorMessage($sErrorMessage);
231 } 233 }