Commit 7ffc064e8bc7e23c49bf33e7c3c055b2dd90cb27

Authored by Michael Joseph
1 parent 1b0b2e39

fixed controller link method

updated web publishing to email comment


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@1525 c91229c3-7414-0410-bfa2-8a42b809f60b
presentation/lookAndFeel/knowledgeTree/documentmanagement/viewBL.php
@@ -134,7 +134,7 @@ if (checkSession()) { @@ -134,7 +134,7 @@ if (checkSession()) {
134 // TODO: create a transaction? 134 // TODO: create a transaction?
135 135
136 $oUser = User::get($oDocument->getCreatorID()); 136 $oUser = User::get($oDocument->getCreatorID());
137 - $sBody = $oUser->getUserName() . ", the collaboration process for the document, '" . getControllerLink("viewDocument", "fDocumentID=" . $oDocument->getID(), $oDocument->getName()) . "', has been completed. "; 137 + $sBody = $oUser->getUserName() . ", the collaboration process for the document, '" . generateControllerLink("viewDocument", "fDocumentID=" . $oDocument->getID(), $oDocument->getName()) . "', has been completed. ";
138 $oEmail = & new Email(); 138 $oEmail = & new Email();
139 $oEmail->send($oUser->getEmail(), "Document collaboration complete", $sBody); 139 $oEmail->send($oUser->getEmail(), "Document collaboration complete", $sBody);
140 140
@@ -171,7 +171,7 @@ if (checkSession()) { @@ -171,7 +171,7 @@ if (checkSession()) {
171 $oDocumentTransaction = & new DocumentTransaction($fDocumentID, "Document sent for web publishing", UPDATE); 171 $oDocumentTransaction = & new DocumentTransaction($fDocumentID, "Document sent for web publishing", UPDATE);
172 $oDocumentTransaction->create(); 172 $oDocumentTransaction->create();
173 $oDocument = Document::get($fDocumentID); 173 $oDocument = Document::get($fDocumentID);
174 - Document::notifyWebMaster($fDocumentID); 174 + Document::notifyWebMaster($fDocumentID, $fComment);
175 $oPatternCustom = & new PatternCustom(); 175 $oPatternCustom = & new PatternCustom();
176 $oPatternCustom->setHtml(getEditPage($oDocument)); 176 $oPatternCustom->setHtml(getEditPage($oDocument));
177 $main->setCentralPayload($oPatternCustom); 177 $main->setCentralPayload($oPatternCustom);
@@ -205,6 +205,7 @@ if (checkSession()) { @@ -205,6 +205,7 @@ if (checkSession()) {
205 $oPatternCustom->setHtml(getWebPublishPage($oDocument)); 205 $oPatternCustom->setHtml(getWebPublishPage($oDocument));
206 $main->setCentralPayload($oPatternCustom); 206 $main->setCentralPayload($oPatternCustom);
207 $main->setFormAction($_SERVER['PHP_SELF']); 207 $main->setFormAction($_SERVER['PHP_SELF']);
  208 + $main->setHasRequiredFields(true);
208 $main->render(); 209 $main->render();
209 } 210 }
210 211