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

HOR-1385 Agregar los campos INP_DOC_TITLE y INP_DOC_DESCRIPTION en la tabla INPUT_DOCUMENT

Browse Source
This commit is contained in:
Ronald Q
2016-07-01 09:58:57 -04:00
parent e8caa0ae5d
commit e910e146ed
14 changed files with 266 additions and 323 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
workflow/engine/methods/inputdocs/inputdocs_Save.php
View File

@@ -54,26 +54,14 @@ try {
$oCriteria = new Criteria( 'workflow' );
$oCriteria->addSelectColumn( InputDocumentPeer::INP_DOC_UID );
$oCriteria->add( InputDocumentPeer::PRO_UID, $sPRO_UID );
$oCriteria->add( InputDocumentPeer::INP_DOC_TITLE, $snameInput );
$oDataset = InputDocumentPeer::doSelectRS( $oCriteria );
$oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
$flag = true;
while ($oDataset->next() && $flag) {
$aRow = $oDataset->getRow();
$oCriteria1 = new Criteria( 'workflow' );
$oCriteria1->addSelectColumn( 'COUNT(*) AS INPUTS' );
$oCriteria1->add( ContentPeer::CON_CATEGORY, 'INP_DOC_TITLE' );
$oCriteria1->add( ContentPeer::CON_ID, $aRow['INP_DOC_UID'] );
$oCriteria1->add( ContentPeer::CON_VALUE, $snameInput );
$oCriteria1->add( ContentPeer::CON_LANG, SYS_LANG );
$oDataset1 = ContentPeer::doSelectRS( $oCriteria1 );
$oDataset1->setFetchmode( ResultSet::FETCHMODE_ASSOC );
$oDataset1->next();
$aRow1 = $oDataset1->getRow();
if ($aRow1['INPUTS']) {
$flag = false;
}
$oDataset->next();
$aRow = $oDataset->getRow();
if ($aRow) {
$flag = false;
}
print $flag;
break;
@@ -88,16 +76,16 @@ try {
$aData = $_POST;
}
//Validating the format of the allowed extentions
//Validating the format of the allowed extentions
//Allowed Types has to have this format -> *.pdf, .xls, *.docx, *.* or .* to all.
$allowedTypes = explode(", ", $aData['INP_DOC_TYPE_FILE']);
foreach ($allowedTypes as $types => $val) {
$allowedTypes = explode(", ", $aData['INP_DOC_TYPE_FILE']);
foreach ($allowedTypes as $types => $val) {
if ((preg_match("/^.*\.?[a-zA-Z0-9]{2,15}$/", $val)) || ($val == "*.*") || ($val == ".*")) {
}else {
$message = G::LoadTranslation( 'ID_UPLOAD_ERR_WRONG_ALLOWED_EXTENSION_FORMAT' );
G::SendMessageText( $message, "ERROR" );
die();
}
}else {
$message = G::LoadTranslation( 'ID_UPLOAD_ERR_WRONG_ALLOWED_EXTENSION_FORMAT' );
G::SendMessageText( $message, "ERROR" );
die();
}
}
if ($aData['INP_DOC_UID'] == '') {