fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PM-4292: 0019346: Links de descarga en los inputs erroneos

Browse Source
This commit is contained in:
marcelo.cuiza
2015-12-07 14:54:14 -04:00
parent 32641fb07b
commit 96338b0486
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
workflow/engine/classes/class.pmDynaform.php
View File

@@ -361,16 +361,20 @@ class pmDynaform
$oCriteria = new Criteria("workflow"); $oCriteria = new Criteria("workflow");
$oCriteria->addSelectColumn(AppDocumentPeer::APP_DOC_UID); $oCriteria->addSelectColumn(AppDocumentPeer::APP_DOC_UID);
$oCriteria->addSelectColumn(AppDocumentPeer::DOC_VERSION); $oCriteria->addSelectColumn(AppDocumentPeer::DOC_VERSION);
$oCriteria->addSelectColumn(ContentPeer::CON_VALUE);
/*----------------------------------********---------------------------------*/ /*----------------------------------********---------------------------------*/
if ($enablePMGmail) { if ($enablePMGmail) {
$oCriteria->addSelectColumn(AppDocumentPeer::APP_DOC_DRIVE_DOWNLOAD); $oCriteria->addSelectColumn(AppDocumentPeer::APP_DOC_DRIVE_DOWNLOAD);
} }
/*----------------------------------********---------------------------------*/ /*----------------------------------********---------------------------------*/
$oCriteria->addJoin(AppDocumentPeer::APP_DOC_UID, ContentPeer::CON_ID, Criteria::LEFT_JOIN);
$oCriteria->add(AppDocumentPeer::APP_UID, $this->fields["APP_DATA"]["APPLICATION"]); $oCriteria->add(AppDocumentPeer::APP_UID, $this->fields["APP_DATA"]["APPLICATION"]);
$oCriteria->add(AppDocumentPeer::APP_DOC_FIELDNAME, $json->name); $oCriteria->add(AppDocumentPeer::APP_DOC_FIELDNAME, $json->name);
$oCriteria->add(ContentPeer::CON_CATEGORY, 'APP_DOC_FILENAME');
$rs = AppDocumentPeer::doSelectRS($oCriteria); $rs = AppDocumentPeer::doSelectRS($oCriteria);
$rs->setFetchmode(ResultSet::FETCHMODE_ASSOC); $rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$links = array(); $links = array();
$labelsFromDb = array();
while ($rs->next()) { while ($rs->next()) {
$row = $rs->getRow(); $row = $rs->getRow();
$linkDownload = "../cases/cases_ShowDocument?a=" . $row["APP_DOC_UID"] . "&v=" . $row["DOC_VERSION"]; $linkDownload = "../cases/cases_ShowDocument?a=" . $row["APP_DOC_UID"] . "&v=" . $row["DOC_VERSION"];
@@ -384,11 +388,17 @@ class pmDynaform
} }
/*----------------------------------********---------------------------------*/ /*----------------------------------********---------------------------------*/
array_push($links, $linkDownload); array_push($links, $linkDownload);
array_push($labelsFromDb, $row["CON_VALUE"]);
} }
$json->data = new stdClass(); $json->data = new stdClass();
$json->data->value = $links; $json->data->value = $links;
if(sizeof($labelsFromDb)) {
$json->data->label = G::json_encode($labelsFromDb);
} else {
$json->data->label = isset($this->fields["APP_DATA"][$json->name . "_label"]) ? $this->fields["APP_DATA"][$json->name . "_label"] : (isset($this->fields["APP_DATA"][$json->name]) ? $this->fields["APP_DATA"][$json->name] : "[]"); $json->data->label = isset($this->fields["APP_DATA"][$json->name . "_label"]) ? $this->fields["APP_DATA"][$json->name . "_label"] : (isset($this->fields["APP_DATA"][$json->name]) ? $this->fields["APP_DATA"][$json->name] : "[]");
} }
}
if ($key === "type" && ($value === "file") && isset($json->variable)) { if ($key === "type" && ($value === "file") && isset($json->variable)) {
//todo //todo
$oCriteria = new Criteria("workflow"); $oCriteria = new Criteria("workflow");