BUG 9586 "Empty folder the icon for that folder is the icon..." SOLVED

- The change in style affection to other icons in ProcessMaker
- When you delete a folder the tree, not reflected in the tree
- Reverted the changes made in "xtheme-gray.css"
- Solved the problem of the icon in the file "casesDocuments.js"
- Solved the problem of the elimination that was not updated in the
  tree, which was due to the response time of the request AJAX
This commit is contained in:
Victor Saisa Lopez
2012-08-09 16:45:52 -04:00
parent 8a218c7342
commit 07f9cb2155
4 changed files with 78 additions and 51 deletions

View File

@@ -816,7 +816,7 @@ td.x-grid3-hd-over .x-grid3-hd-inner, td.sort-desc .x-grid3-hd-inner, td.sort-as
}
.x-tree-node-leaf .x-tree-node-icon{
background-image:url(/images/ext/default/tree/folder.gif);
background-image:url(/images/ext/default/tree/leaf.gif);
}
.x-tree-node-collapsed .x-tree-node-icon{

View File

@@ -816,7 +816,7 @@ td.x-grid3-hd-over .x-grid3-hd-inner, td.sort-desc .x-grid3-hd-inner, td.sort-as
}
.x-tree-node-leaf .x-tree-node-icon{
background-image:url(/images/ext/default/tree/folder.gif);
background-image:url(/images/ext/default/tree/leaf.gif);
}
.x-tree-node-collapsed .x-tree-node-icon{

View File

@@ -816,7 +816,7 @@ td.x-grid3-hd-over .x-grid3-hd-inner, td.sort-desc .x-grid3-hd-inner, td.sort-as
}
.x-tree-node-leaf .x-tree-node-icon{
background-image:url(/images/ext/default/tree/folder.gif);
background-image:url(/images/ext/default/tree/leaf.gif);
}
.x-tree-node-collapsed .x-tree-node-icon{

View File

@@ -72,6 +72,36 @@ streamFilefromPM=function(fileStream) {
});
};
function nodeRootCreate()
{
var node = new Ext.tree.AsyncTreeNode({
id: "root",
text: "/",
draggable: false,
expanded: true,
cls: "folder",
listeners: {
beforeload: function (nodeRoot) {
nodeRoot.setIcon("");
},
load: function (nodeRoot) {
nodeRoot.setIcon("/images/ext/default/tree/folder.gif");
},
expand: function (nodeRoot) {
if (nodeRoot.hasChildNodes()) {
nodeRoot.setIcon("/images/ext/default/tree/folder-open.gif");
}
},
collapse: function (nodeRoot) {
nodeRoot.setIcon("/images/ext/default/tree/folder.gif");
}
}
});
return node;
}
function chDir( directory, loadGridOnly ) {
// console.info("**** Changing Directory: "+directory+" --
@@ -458,8 +488,6 @@ function openActionDialog( caller, action ) {
}
function handleCallback(requestParams, node) {
// console.log("handleCallback "+requestParams +" -- "+node);
// console.trace();
var conn = new Ext.data.Connection();
conn.request({
@@ -493,6 +521,15 @@ function handleCallback(requestParams, node) {
} else {
Ext.Msg.alert( 'Failure', json.error );
}
if (options.params.option == "directory") {
switch (options.params.action) {
case "delete":
case "rename":
Ext.getCmp("dirTreePanel").setRootNode(nodeRootCreate());
break;
}
}
}
else {
Ext.Msg.alert( 'Error', 'Failed to connect to the server.');
@@ -546,27 +583,25 @@ function getRequestParams() {
* Function for actions, which don't require a form like download,
* extraction, deletion etc.
*/
function deleteFiles(btn) {
if( btn != 'yes') {
function deleteFiles(btn)
{
if (btn != "yes") {
return;
}
requestParams = getRequestParams();
requestParams.action = 'delete';
requestParams.action = "delete";
handleCallback(requestParams);
if(requestParams.option=='documents'){
datastore.sendWhat = 'files';
if (requestParams.option == "documents") {
datastore.sendWhat = "files";
loadDir();
} else {
var root1 = new Ext.tree.AsyncTreeNode({
text : '/',
draggable : false,
expanded : true,
id : 'root'
});
Ext.getCmp('dirTreePanel').setRootNode(root1);
//Ext.getCmp("dirTreePanel").setRootNode(nodeRootCreate());
}
}
function extractArchive(btn) {
if( btn != 'yes') {
return;
@@ -575,24 +610,21 @@ function extractArchive(btn) {
requestParams.action = 'extract';
handleCallback(requestParams);
}
function deleteDir( btn, node ) {
if( btn != 'yes') {
function deleteDir(btn, node)
{
if (btn != "yes") {
return;
}
requestParams = getRequestParams();
requestParams.dir = datastore.directory.substring( 0, datastore.directory.lastIndexOf('/'));
requestParams.selitems = Array( node.id.replace( /_RRR_/g, '/' ) );
requestParams.action = 'delete';
requestParams.dir = datastore.directory.substring(0, datastore.directory.lastIndexOf("/"));
requestParams.selitems = Array(node.id.replace(/_RRR_/g, "/"));
requestParams.action = "delete";
handleCallback(requestParams, node);
var root1 = new Ext.tree.AsyncTreeNode({
text : '/',
draggable : false,
expanded : true,
id : 'root'
});
Ext.getCmp('dirTreePanel').setRootNode(root1);
//Ext.getCmp("dirTreePanel").setRootNode(nodeRootCreate());
}
Ext.msgBoxSlider = function(){
@@ -1605,9 +1637,10 @@ var documentsTab = {
animate : true,
tools:[
{
id:'refresh',
handler:function() {
Ext.getCmp('dirTreePanel').getRootNode().reload();
id: "refresh",
handler: function () {
//Ext.getCmp("dirTreePanel").getRootNode().reload();
Ext.getCmp("dirTreePanel").setRootNode(nodeRootCreate());
}
}
],
@@ -1663,13 +1696,7 @@ var documentsTab = {
}
},
root : new Ext.tree.AsyncTreeNode({
text : '/',
draggable : false,
expanded : true,
cls: 'folder',
id : 'root'
})
root: nodeRootCreate()
},
{
layout : "border",