fernando/luos
1
0
Fork 0
Code Releases Activity

BUG 10036 No esta rezalizando un buen conteo de la paginacion en Documents SOLVED

Browse Source 
- Incorrect calculation of the items in the folder
- Fix the formula to calculate the items in the folder
This commit is contained in:
Julio Cesar Laura
2012-11-09 17:14:52 -04:00
parent 507dce7552
commit ecc82882fc
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -152,7 +152,6 @@ class AppFolder extends BaseAppFolder
$Criteria->add( appFolderPeer::FOLDER_PARENT_UID, $folderID, CRITERIA::EQUAL ); $Criteria->add( appFolderPeer::FOLDER_PARENT_UID, $folderID, CRITERIA::EQUAL );
$Criteria->addAscendingOrderByColumn( AppFolderPeer::FOLDER_NAME ); $Criteria->addAscendingOrderByColumn( AppFolderPeer::FOLDER_NAME );
$response['totalFoldersCount'] = AppFolderPeer::doCount( $Criteria );
$response['folders'] = array (); $response['folders'] = array ();
if ($limit != 0) { if ($limit != 0) {
@@ -168,6 +167,7 @@ class AppFolder extends BaseAppFolder
$response['folders'][] = $row; $response['folders'][] = $row;
$rs->next(); $rs->next();
} }
$response['totalFoldersCount'] = count($response['folders']);
return ($response); return ($response);
} }
@@ -280,7 +280,6 @@ class AppFolder extends BaseAppFolder
$oCriteria->addAscendingOrderByColumn( AppDocumentPeer::APP_DOC_INDEX ); $oCriteria->addAscendingOrderByColumn( AppDocumentPeer::APP_DOC_INDEX );
$oCriteria->addDescendingOrderByColumn( AppDocumentPeer::DOC_VERSION ); $oCriteria->addDescendingOrderByColumn( AppDocumentPeer::DOC_VERSION );
$response['totalDocumentsCount'] = AppDocumentPeer::doCount( $oCriteria );
$response['documents'] = array (); $response['documents'] = array ();
$oCriteria->setLimit( $limit ); $oCriteria->setLimit( $limit );
@@ -322,6 +321,7 @@ class AppFolder extends BaseAppFolder
} }
$rs->next(); $rs->next();
} }
$response['totalDocumentsCount'] = count($response['documents']);
return ($response); return ($response);
} }

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

@@ -341,7 +341,7 @@ function expandNode()
} }
//G::pr($processListTree); //G::pr($processListTree);
if ((isset($_POST['option'])) && ($_POST['option'] == "gridDocuments")) { if ((isset($_POST['option'])) && ($_POST['option'] == "gridDocuments")) {
$processListTreeTemp['totalCount']=$totalFolders+$totalDocuments;//count($processListTree); $processListTreeTemp['totalCount']=$totalFolders+count($processListTree);
$processListTreeTemp['msg']='correct reload'; $processListTreeTemp['msg']='correct reload';
$processListTreeTemp['items']=$processListTree; $processListTreeTemp['items']=$processListTree;
$processListTree = $processListTreeTemp; $processListTree = $processListTreeTemp;
@@ -615,7 +615,7 @@ function uploadDocument()
$functionsToReplace["function_standardupload_btnsave"]=' function() { $functionsToReplace["function_standardupload_btnsave"]=' function() {
statusBarMessage("'.G::LoadTranslation('ID_UPLOADING_FILE').'", true, true); statusBarMessage("'.G::LoadTranslation('ID_UPLOADING_FILE').'", true, true);
form = Ext.getCmp("uploadform").getForm(); form = Ext.getCmp("uploadform").getForm();
//Ext.getCmp("uploadform").getForm().submit(); //Ext.getCmp("uploadform").getForm().submit();
//console.log(form); //console.log(form);
//console.log(form.url); //console.log(form.url);
@@ -623,13 +623,13 @@ function uploadDocument()
//reset: true, //reset: true,
reset: false, reset: false,
success: function(form, action) { success: function(form, action) {
datastore.reload(); datastore.reload();
statusBarMessage(action.result.message, false, true); statusBarMessage(action.result.message, false, true);
Ext.getCmp("dialog").destroy(); Ext.getCmp("dialog").destroy();
}, },
failure: function(form, action) { failure: function(form, action) {
if(!action.result) return; if(!action.result) return;
Ext.MessageBox.alert("error", action.result.error); Ext.MessageBox.alert("error", action.result.error);
statusBarMessage(action.result.error, false, false); statusBarMessage(action.result.error, false, false);