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

BUG 7920 The "Not in folder" folder shouldn't be created by default

Browse Source 
removed "Not in Folder" and all documents that hadn't a defined folder is showed in ROOT now
This commit is contained in:
Carlos Pacha
2011-11-08 18:56:41 -04:00
parent 626fd1a9ba
commit 8ec28d5f71
3 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -178,7 +178,12 @@ if($limit != 0){
$fields ['FOLDER_CREATE_DATE'] = "";
$fields ['FOLDER_UPDATE_DATE'] = "";
} else {
$fields = array ();
// $fields = array ();
$fields ['FOLDER_UID'] = "/";
$fields ['FOLDER_PARENT_UID'] = "";
$fields ['FOLDER_NAME'] = "root";
$fields ['FOLDER_CREATE_DATE'] = "";
$fields ['FOLDER_UPDATE_DATE'] = "";
}
return $fields;
}
@@ -211,10 +216,15 @@ if($limit != 0){
$oAppDocument = new AppDocument ( );
$oCriteria = new Criteria ( );
if ((is_array ( $docIdFilter )) && (count ( $docIdFilter ) > 0)) { //Search by App Doc UID no matter what Folder it is
$oCriteria->add ( AppDocumentPeer::APP_DOC_UID, $docIdFilter, CRITERIA::IN );
} elseif ($folderID != NULL) {
if($folderID=="/"){
$oCriteria->add ( AppDocumentPeer::FOLDER_UID, array('root','',NULL), CRITERIA::IN );
}else{
$oCriteria->add ( AppDocumentPeer::FOLDER_UID, $folderID );
}
} elseif ($searchType == "TAG") {
$oCriteria->add ( AppDocumentPeer::APP_DOC_TAGS, "%" . $keyword . "%", CRITERIA::LIKE );
}
@@ -234,7 +244,9 @@ if($limit != 0){
$oCriteria->setLimit($limit);
$oCriteria->setOffset($start);
$rs = AppDocumentPeer::doSelectRS ( $oCriteria );
$rs->setFetchmode ( ResultSet::FETCHMODE_ASSOC );
$rs->next ();
$filesResult = array ();
@@ -459,4 +471,4 @@ if($limit != 0){
$oCriteria->add ( AppFolderPeer::FOLDER_UID, $FolderUid );
AppFolderPeer::doDelete($oCriteria);
}
} // AppFolder
} // AppFolder