gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-03-11 00:15:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

actually use uploaded file

Browse Source
This commit is contained in:
Uwe Steinmann 2015-06-12 12:56:17 +02:00
parent 34a7df9180
commit da7c04d250
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
controllers/class.ApproveDocument.php
View File

@ -32,6 +32,7 @@ class SeedDMS_Controller_ApproveDocument extends SeedDMS_Controller_Common {
$approvaltype = $this->params['approvaltype']; $approvaltype = $this->params['approvaltype'];
$group = $this->params['group']; $group = $this->params['group'];
$comment = $this->params['comment']; $comment = $this->params['comment'];
$file = $this->params['file'];
/* Get the document id and name before removing the document */ /* Get the document id and name before removing the document */
$docname = $document->getName(); $docname = $document->getName();
@ -43,13 +44,13 @@ class SeedDMS_Controller_ApproveDocument extends SeedDMS_Controller_Common {
$result = $this->callHook('approveDocument', $content); $result = $this->callHook('approveDocument', $content);
if($result === null) { if($result === null) {
if ($approvaltype == "ind") { if ($approvaltype == "ind") {
if(0 > $content->setApprovalByInd($user, $user, $approvalstatus, $comment)) { if(0 > $content->setApprovalByInd($user, $user, $approvalstatus, $comment, $file)) {
$this->error = 1; $this->error = 1;
$this->errormsg = "approval_update_failed"; $this->errormsg = "approval_update_failed";
return false; return false;
} }
} elseif ($approvaltype == "grp") { } elseif ($approvaltype == "grp") {
if(0 > $content->setApprovalByGrp($group, $user, $approvalstatus, $comment)) { if(0 > $content->setApprovalByGrp($group, $user, $approvalstatus, $comment, $file)) {
$this->error = 1; $this->error = 1;
$this->errormsg = "approval_update_failed"; $this->errormsg = "approval_update_failed";
return false; return false;

5
controllers/class.ReviewDocument.php
View File

@ -32,6 +32,7 @@ class SeedDMS_Controller_ReviewDocument extends SeedDMS_Controller_Common {
$reviewtype = $this->params['reviewtype']; $reviewtype = $this->params['reviewtype'];
$group = $this->params['group']; $group = $this->params['group'];
$comment = $this->params['comment']; $comment = $this->params['comment'];
$file = $this->params['file'];
/* Get the document id and name before removing the document */ /* Get the document id and name before removing the document */
$docname = $document->getName(); $docname = $document->getName();
@ -44,13 +45,13 @@ class SeedDMS_Controller_ReviewDocument extends SeedDMS_Controller_Common {
if($result === null) { if($result === null) {
if ($reviewtype == "ind") { if ($reviewtype == "ind") {
if(0 > $content->setReviewByInd($user, $user, $reviewstatus, $comment)) { if(0 > $content->setReviewByInd($user, $user, $reviewstatus, $comment, $file)) {
$this->error = 1; $this->error = 1;
$this->errormsg = "review_update_failed"; $this->errormsg = "review_update_failed";
return false; return false;
} }
} elseif ($reviewtype == "grp") { } elseif ($reviewtype == "grp") {
if(0 > $content->setReviewByGrp($group, $user, $reviewstatus, $comment)) { if(0 > $content->setReviewByGrp($group, $user, $reviewstatus, $comment, $file)) {
$this->error = 1; $this->error = 1;
$this->errormsg = "review_update_failed"; $this->errormsg = "review_update_failed";
return false; return false;