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

BUG-14053 El ordenamiento de archivos no se realiza... SOLVED

Browse Source 
- El ordenamiento de las columnas no tenian una busqueda asignada.
- Se habilitaron solo dos columnas para el ordenamiento "Name, Modified".
- Se cambio el criteria para que acepte esos parametros en el archivo AppFolder.php
This commit is contained in:
Marco Antonio Nina
2014-05-21 16:11:32 -04:00
parent 830153a7cb
commit 3b594a573d
3 changed files with 55 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
workflow/engine/classes/model/AppFolder.php
View File

@@ -397,6 +397,21 @@ class AppFolder extends BaseAppFolder
$oAppDocument = new AppDocument(); $oAppDocument = new AppDocument();
$oCriteria = new Criteria(); $oCriteria = new Criteria();
$oCriteria->addSelectColumn( AppDocumentPeer::APP_DOC_UID);
$oCriteria->addSelectColumn( AppDocumentPeer::DOC_VERSION);
$oCriteria->addSelectColumn( AppDocumentPeer::APP_UID);
$oCriteria->addSelectColumn( AppDocumentPeer::DEL_INDEX);
$oCriteria->addSelectColumn( AppDocumentPeer::DOC_UID);
$oCriteria->addSelectColumn( AppDocumentPeer::USR_UID);
$oCriteria->addSelectColumn( AppDocumentPeer::APP_DOC_TYPE);
$oCriteria->addSelectColumn( AppDocumentPeer::APP_DOC_CREATE_DATE);
$oCriteria->addSelectColumn( AppDocumentPeer::APP_DOC_INDEX);
$oCriteria->addSelectColumn( AppDocumentPeer::FOLDER_UID);
$oCriteria->addSelectColumn( AppDocumentPeer::APP_DOC_PLUGIN);
$oCriteria->addSelectColumn( AppDocumentPeer::APP_DOC_TAGS);
$oCriteria->addSelectColumn( AppDocumentPeer::APP_DOC_STATUS);
$oCriteria->addSelectColumn( AppDocumentPeer::APP_DOC_STATUS_DATE);
$oCriteria->addSelectColumn( AppDocumentPeer::APP_DOC_FIELDNAME);
if ((is_array( $docIdFilter )) && (count( $docIdFilter ) > 0)) { if ((is_array( $docIdFilter )) && (count( $docIdFilter ) > 0)) {
//Search by App Doc UID no matter what Folder it is //Search by App Doc UID no matter what Folder it is
@@ -411,6 +426,7 @@ class AppFolder extends BaseAppFolder
$oCriteria->add( AppDocumentPeer::APP_DOC_TAGS, "%" . $keyword . "%", CRITERIA::LIKE ); $oCriteria->add( AppDocumentPeer::APP_DOC_TAGS, "%" . $keyword . "%", CRITERIA::LIKE );
} }
require_once ("classes/model/AppDelegation.php");
if ($user != '') { if ($user != '') {
require_once ("classes/model/AppDelegation.php"); require_once ("classes/model/AppDelegation.php");
$criteria = new Criteria(); $criteria = new Criteria();
@@ -440,15 +456,25 @@ class AppFolder extends BaseAppFolder
$oCriteria->add( AppDocumentPeer::APP_DOC_STATUS, 'ACTIVE' ); $oCriteria->add( AppDocumentPeer::APP_DOC_STATUS, 'ACTIVE' );
} }
$oCriteria->addSelectColumn( ContentPeer::CON_VALUE . ' AS NAME');
$oCriteria->add( ContentPeer::CON_CATEGORY, "APP_DOC_FILENAME");
$oCriteria->add( ContentPeer::CON_LANG, SYS_LANG);
$oCriteria->addJoin( AppDocumentPeer::APP_DOC_UID, ContentPeer::CON_ID, Criteria::LEFT_JOIN );
$numRecTotal = AppDocumentPeer::doCount($oCriteria); $numRecTotal = AppDocumentPeer::doCount($oCriteria);
$oCase->verifyTable(); $oCase->verifyTable();
//Need to review hot to get the Column Type name //Need to review hot to get the Column Type name
switch($ColumnSort) { switch($ColumnSort) {
case 'appDocCreateDate' : $ColumnSort = AppDocumentPeer::APP_DOC_CREATE_DATE; break; case 'appDocCreateDate' :
//... $ColumnSort = AppDocumentPeer::APP_DOC_CREATE_DATE;
default: break; break;
case 'name' :
$ColumnSort = 'NAME';
break;
default:
break;
} }
if($direction == 'ASC') { if($direction == 'ASC') {
@@ -507,8 +533,6 @@ class AppFolder extends BaseAppFolder
return $response; return $response;
} }
public function getCompleteDocumentInfo ($appUid, $appDocUid, $docVersion, $docUid, $usrId) public function getCompleteDocumentInfo ($appUid, $appDocUid, $docVersion, $docUid, $usrId)
{ {
//require_once ("classes/model/AppDocument.php"); //require_once ("classes/model/AppDocument.php");

4
workflow/engine/methods/appFolder/appFolderAjax.php
View File

@@ -8,9 +8,7 @@ if (! isset ($_SESSION ['USER_LOGGED'])) {
} }
if (isset ($_REQUEST ['action']) && isset($_REQUEST['sort']) && isset($_REQUEST['dir'])) { if (isset ($_REQUEST ['action']) && isset($_REQUEST['sort']) && isset($_REQUEST['dir'])) {
if ($_REQUEST['sort'] == "appDocCreateDate" && ($_REQUEST['dir'] == 'ASC' || $_REQUEST['dir'] == 'DESC')) { sortContent();
sortContent();
}
} }

8
workflow/engine/templates/cases/casesDocuments.js
View File

@@ -1271,7 +1271,7 @@ rowExpander, {
header: _("ID_OWNER"), header: _("ID_OWNER"),
dataIndex: "owner", dataIndex: "owner",
width: 100, width: 100,
sortable: true, sortable: false,
groupable: true, groupable: true,
renderer: renderFullName renderer: renderFullName
//sortable: false //sortable: false
@@ -1290,7 +1290,7 @@ rowExpander, {
header: _("ID_TYPE"), header: _("ID_TYPE"),
dataIndex: "type", dataIndex: "type",
width: 100, width: 100,
sortable: true, sortable: false,
groupable: true, groupable: true,
//align: "right", //align: "right",
renderer: renderType renderer: renderType
@@ -1298,7 +1298,7 @@ rowExpander, {
header: _("ID_PROCESS"), header: _("ID_PROCESS"),
dataIndex: "proTitle", dataIndex: "proTitle",
width: 150, width: 150,
sortable: true, sortable: false,
groupable: true groupable: true
//align: "right" //align: "right"
//renderer: renderType //renderer: renderType
@@ -1306,7 +1306,7 @@ rowExpander, {
header: _("ID_CASE"), header: _("ID_CASE"),
dataIndex: "appLabel", dataIndex: "appLabel",
width: 150, width: 150,
sortable: true, sortable: false,
groupable: true groupable: true
//align: "right" //align: "right"
//renderer: renderType //renderer: renderType