Merge pull request #231 from victorsl/BUG-9402

BUG 9402 "Falta el rotulo de Documents en la columna cuando se..." SOLVED
This commit is contained in:
julceslauhub
2012-07-12 11:26:38 -07:00

View File

@@ -58,7 +58,7 @@ streamFilefromPM=function(fileStream) {
src: fileStream src: fileStream
}); });
}else{ }else{
msgbox = Ext.Msg.alert('Error', results.message); msgbox = Ext.Msg.alert('Error', results.message);
msgbox.setIcon( Ext.MessageBox.ERROR ); msgbox.setIcon( Ext.MessageBox.ERROR );
} }
@@ -67,7 +67,7 @@ streamFilefromPM=function(fileStream) {
if (results.message) { if (results.message) {
Ext.Msg.alert('Infomation',results.message); Ext.Msg.alert('Infomation',results.message);
} }
} }
}); });
}; };
@@ -126,7 +126,7 @@ function chDir( directory, loadGridOnly ) {
} }
} }
function expandTreeToDir( node, dir ) { function expandTreeToDir( node, dir ) {
// console.info("Expanding Tree to Dir "+node+" - "+dir); // console.info("Expanding Tree to Dir "+node+" - "+dir);
dir = dir ? dir : new String(''); dir = dir ? dir : new String('');
@@ -164,10 +164,10 @@ function expandNode( node, dir ) {
if( node.id.substr( 0, 5 ) != '_RRR_' ) { if( node.id.substr( 0, 5 ) != '_RRR_' ) {
fulldirpath = fulldirpath.substr( 5 ); fulldirpath = fulldirpath.substr( 5 );
} }
if( node.id != fulldirpath ) { if( node.id != fulldirpath ) {
dirpath = ''; dirpath = '';
var nodedirs = node.id.split('_RRR_'); var nodedirs = node.id.split('_RRR_');
if( nodedirs[0] == '' ) nodedirs.shift(); if( nodedirs[0] == '' ) nodedirs.shift();
for( i=0; i < dirs.length; i++ ) { for( i=0; i < dirs.length; i++ ) {
@@ -196,16 +196,16 @@ function expandNode( node, dir ) {
else { else {
node.select(); node.select();
} }
} }
} }
function handleNodeClick( sm, node ) { function handleNodeClick( sm, node ) {
if( node && node.id ) { if( node && node.id ) {
// console.log("Node Clicked: "+node); // console.log("Node Clicked: "+node);
chDir( node.id ); chDir( node.id );
} }
} }
function showLoadingIndicator( el, replaceContent ) { function showLoadingIndicator( el, replaceContent ) {
// console.info("showLoadingIndicator"); // console.info("showLoadingIndicator");
if( !el ) return; if( !el ) return;
@@ -293,7 +293,7 @@ function openActionDialog( caller, action ) {
// animateTarget: typeof caller.getEl == 'function' // animateTarget: typeof caller.getEl == 'function'
// ? caller.getEl() : caller, // ? caller.getEl() : caller,
// title: 'dialog_title' // title: 'dialog_title'
}); });
} }
Ext.Ajax.request( { Ext.Ajax.request( {
@@ -306,13 +306,13 @@ function openActionDialog( caller, action ) {
msgbox.setIcon( Ext.MessageBox.ERROR ); msgbox.setIcon( Ext.MessageBox.ERROR );
} }
if( oResponse && oResponse.responseText ) { if( oResponse && oResponse.responseText ) {
// Ext.Msg.alert("Debug", // Ext.Msg.alert("Debug",
// oResponse.responseText // oResponse.responseText
// ); // );
try{ try{
json = Ext.decode( oResponse.responseText ); json = Ext.decode( oResponse.responseText );
if( json.error && typeof json.error != 'xml' ) { if( json.error && typeof json.error != 'xml' ) {
Ext.Msg.alert( "error", json.error ); Ext.Msg.alert( "error", json.error );
dialog.destroy(); dialog.destroy();
@@ -366,7 +366,7 @@ function openActionDialog( caller, action ) {
newWidth = firstComponent.getWidth() + dialog.getFrameWidth(); newWidth = firstComponent.getWidth() + dialog.getFrameWidth();
newHeight = firstComponent.getHeight() + dialog.getFrameHeight(); newHeight = firstComponent.getHeight() + dialog.getFrameHeight();
dialog.setSize( newWidth, newHeight ); dialog.setSize( newWidth, newHeight );
} catch(e) {} } catch(e) {}
// alert( "Before: // alert( "Before:
// Dialog.width: " + // Dialog.width: " +
@@ -402,7 +402,7 @@ function openActionDialog( caller, action ) {
} }
} }
}); });
if( action != "edit" ) { if( action != "edit" ) {
dialog.on( 'hide', function() { dialog.on( 'hide', function() {
dialog.destroy(true); dialog.destroy(true);
@@ -415,24 +415,24 @@ function openActionDialog( caller, action ) {
var num = selectedRows.length; var num = selectedRows.length;
Ext.Msg.confirm(TRANSLATIONS.ID_DELETE, String.format(TRANSLATIONS.ID_DELETE_SELECTED_ITEMS, num ), deleteFiles); Ext.Msg.confirm(TRANSLATIONS.ID_DELETE, String.format(TRANSLATIONS.ID_DELETE_SELECTED_ITEMS, num ), deleteFiles);
break; break;
case 'download': case 'download':
fileName=ext_itemgrid.getSelectionModel().getSelected().get('name'); fileName=ext_itemgrid.getSelectionModel().getSelected().get('name');
// alert(ext_itemgrid.getSelectionModel().getSelected().get('downloadLink')); // alert(ext_itemgrid.getSelectionModel().getSelected().get('downloadLink'));
// alert(ext_itemgrid.getSelectionModel().getSelected().get('downloadLabel')); // alert(ext_itemgrid.getSelectionModel().getSelected().get('downloadLabel'));
var urlDownload = ext_itemgrid.getSelectionModel().getSelected().get("downloadLink"); var urlDownload = ext_itemgrid.getSelectionModel().getSelected().get("downloadLink");
if (ext_itemgrid.getSelectionModel().getSelected().get("appDocPlugin") != "") { if (ext_itemgrid.getSelectionModel().getSelected().get("appDocPlugin") != "") {
messageText = TRANSLATIONS.ID_DOWNLOADING_FILE + " " + ext_itemgrid.getSelectionModel().getSelected().get("name"); messageText = TRANSLATIONS.ID_DOWNLOADING_FILE + " " + ext_itemgrid.getSelectionModel().getSelected().get("name");
statusBarMessage(messageText, true, true); statusBarMessage(messageText, true, true);
try { try {
Ext.destroy(Ext.get("downloadIframe")); Ext.destroy(Ext.get("downloadIframe"));
} }
catch (e) { catch (e) {
} }
Ext.DomHelper.append(document.body, { Ext.DomHelper.append(document.body, {
tag: "iframe", tag: "iframe",
id: "downloadIframe", id: "downloadIframe",
@@ -446,7 +446,7 @@ function openActionDialog( caller, action ) {
else { else {
streamFilefromPM(urlDownload); streamFilefromPM(urlDownload);
} }
/* /*
* if(document.location = * if(document.location =
* ext_itemgrid.getSelectionModel().getSelected().get('downloadLink')){ * ext_itemgrid.getSelectionModel().getSelected().get('downloadLink')){
@@ -540,7 +540,7 @@ function getRequestParams() {
'selitems[]': selitems 'selitems[]': selitems
}; };
return requestParams; return requestParams;
} }
/** /**
* Function for actions, which don't require a form like download, * Function for actions, which don't require a form like download,
@@ -564,7 +564,7 @@ function deleteFiles(btn) {
expanded : true, expanded : true,
id : 'root' id : 'root'
}); });
Ext.getCmp('dirTreePanel').setRootNode(root1); Ext.getCmp('dirTreePanel').setRootNode(root1);
} }
} }
function extractArchive(btn) { function extractArchive(btn) {
@@ -584,7 +584,7 @@ function deleteDir( btn, node ) {
requestParams.selitems = Array( node.id.replace( /_RRR_/g, '/' ) ); requestParams.selitems = Array( node.id.replace( /_RRR_/g, '/' ) );
requestParams.action = 'delete'; requestParams.action = 'delete';
handleCallback(requestParams, node); handleCallback(requestParams, node);
var root1 = new Ext.tree.AsyncTreeNode({ var root1 = new Ext.tree.AsyncTreeNode({
text : '/', text : '/',
draggable : false, draggable : false,
@@ -658,9 +658,9 @@ function statusBarMessage( msg, isLoading, success ) {
clear: true clear: true
}); });
Ext.msgBoxSlider.msg('Error', msg ); Ext.msgBoxSlider.msg('Error', msg );
} }
} }
@@ -769,7 +769,7 @@ datastore = new Ext.data.Store({
},{ },{
name : "downloadLabel" name : "downloadLabel"
} }
])), ])),
// turn on remote sorting // turn on remote sorting
@@ -793,7 +793,7 @@ function renderFileName(value, p, record) {
'<img src="{0}" alt="* " align="absmiddle" />&nbsp;<b>{1}</b>', '<img src="{0}" alt="* " align="absmiddle" />&nbsp;<b>{1}</b>',
record.get('icon'), value); record.get('icon'), value);
} }
function renderType(value, p, record) { function renderType(value, p, record) {
if(record.get('appDocType')!=""){ if(record.get('appDocType')!=""){
return String.format('{1}, {0}', value,record.get('appDocType')); return String.format('{1}, {0}', value,record.get('appDocType'));
}else{ }else{
@@ -818,7 +818,7 @@ function renderVersion(value, p, record) {
return String.format('{0}', value); return String.format('{0}', value);
} }
}else{ }else{
return String.format('<b>-</b>',value); return String.format('<b>-</b>',value);
} }
} }
@@ -836,7 +836,7 @@ function renderVersionExpander(value, p, record) {
return ''; return '';
} }
}else{ }else{
return String.format('',value); return String.format('',value);
} }
} }
@@ -1066,7 +1066,7 @@ var gridbb = new Ext.PagingToolbar({
var grid; var grid;
var getGrid = function( data, element) { var getGrid = function( data, element) {
// var grid = Ext.getCmp('gridpanel'); // var grid = Ext.getCmp('gridpanel');
grid = new Ext.grid.GridPanel({ grid = new Ext.grid.GridPanel({
store: datastore, store: datastore,
cm: cm, cm: cm,
@@ -1094,7 +1094,7 @@ var expander = new Ext.ux.grid.RowExpander({
* tpl : new Ext.Template( '<p><b>Company:</b> {company}</p><br>', '<p><b>Summary:</b> * tpl : new Ext.Template( '<p><b>Company:</b> {company}</p><br>', '<p><b>Summary:</b>
* {desc}</p>' ), * {desc}</p>' ),
*/ */
// width : 50, // width : 50,
// align : 'center', // align : 'center',
@@ -1114,124 +1114,124 @@ var expander = new Ext.ux.grid.RowExpander({
renderer : renderVersionExpander renderer : renderVersionExpander
}); });
// the column model has information about grid columns //The column model has information about grid columns
// dataIndex maps the column to the specific data field in //dataIndex maps the column to the specific data field in
// the data store //the data store
var cm = new Ext.grid.ColumnModel([{ var cm = new Ext.grid.ColumnModel([{
id : 'gridcm', // id assigned so we can apply custom css (e.g. id: "gridcm", //id assigned so we can apply custom css (e.g. -> .x-grid-col-topic b { color:#333 })
// .x-grid-col-topic b { color:#333 }) header: _("ID_NAME"),
header : TRANSLATIONS.ID_NAME, dataIndex: "name",
dataIndex : 'name', width: 200,
width : 200, renderer: renderFileName,
renderer : renderFileName, sortable: true,
sortable:true, groupable: true,
groupable:true, editor: new Ext.form.TextField({
editor : new Ext.form.TextField({ allowBlank: false
allowBlank : false
}), }),
css : 'white-space:normal;' css: "white-space:normal;"
}, { }, {
header : TRANSLATIONS.ID_VERSION, header: _("ID_VERSION"),
dataIndex : 'docVersion', dataIndex: "docVersion",
width : 50, width: 100,
align : 'center', align: "center",
renderer : renderVersion renderer: renderVersion
}, /* expander, */{ }, /* expander, */{
header : TRANSLATIONS.ID_MODIFIED, header: _("ID_MODIFIED"),
dataIndex : 'appDocCreateDate', dataIndex: "appDocCreateDate",
width : 65, width: 100,
renderer: renderModifiedDate renderer: renderModifiedDate
}, { }, {
header : TRANSLATIONS.ID_OWNER, header: _("ID_OWNER"),
dataIndex : 'owner', dataIndex: "owner",
width : 100, width: 100,
sortable:true, sortable: true,
groupable:true, groupable: true,
renderer: renderFullName renderer: renderFullName
// sortable : false //sortable: false
}, { }, {
header : "PM Type", header: _("ID_DOCUMENT_TYPE"),
dataIndex : 'appDocType', dataIndex: "appDocType",
width : 70, width: 100,
hidden:true hidden: true
// align : 'right' //align: "right"
// renderer : renderType //renderer: renderType
}, { }, {
dataIndex: "appDocPlugin", dataIndex: "appDocPlugin",
hidden: true,
hideable: false
}, {
header: _("ID_TYPE"),
dataIndex: "type",
width: 100,
sortable: true,
groupable: true,
//align: "right",
renderer: renderType
}, {
header: _("ID_PROCESS"),
dataIndex: "proTitle",
width: 150,
sortable: true,
groupable: true
//align: "right"
//renderer: renderType
}, {
header: _("ID_CASE"),
dataIndex: "appLabel",
width: 150,
sortable: true,
groupable: true
//align: "right"
//renderer: renderType
},{
header: _("ID_SIZE"),
dataIndex: "size",
width: 50,
hidden: true hidden: true
}, { }, {
header : TRANSLATIONS.ID_TYPE, header: _("ID_PERMISSIONS"),
dataIndex : 'type', dataIndex: "perms",
width : 100, width: 100,
sortable:true, hidden: true
groupable:true,
// align : 'right',
renderer : renderType
}, { }, {
header : TRANSLATIONS.ID_PROCESS, dataIndex: "is_deletable",
dataIndex : 'proTitle', hidden: true,
width : 150, hideable: false
sortable:true,
groupable:true
// align : 'right'
// renderer : renderType
}, { }, {
header : TRANSLATIONS.ID_CASE, dataIndex: "is_file",
dataIndex : 'appLabel', hidden: true,
width : 150, hideable: false
sortable:true,
groupable:true
// align : 'right'
// renderer : renderType
},{
header : TRANSLATIONS.ID_SIZE,
dataIndex : 'size',
width : 50,
hidden:true
}, { }, {
header : TRANSLATIONS.ID_PERMISSIONS, dataIndex: "is_archive",
dataIndex : 'perms', hidden: true,
width : 100, hideable: false
hidden:true
}, { }, {
dataIndex : 'is_deletable', dataIndex: "is_writable",
hidden : true, hidden: true,
hideable : false hideable: false
}, { }, {
dataIndex : 'is_file', dataIndex: "is_chmodable",
hidden : true, hidden: true,
hideable : false hideable: false
}, { }, {
dataIndex : 'is_archive', dataIndex: "is_readable",
hidden : true, hidden: true,
hideable : false hideable: false
}, { }, {
dataIndex : 'is_writable', dataIndex: "is_deletable",
hidden : true, hidden: true,
hideable : false hideable: false
}, { }, {
dataIndex : 'is_chmodable', dataIndex: "is_editable",
hidden : true, hidden: true,
hideable : false hideable: false
}, { }, {
dataIndex : 'is_readable', dataIndex: "id",
hidden : true, hidden: true,
hideable : false hideable: false
}, { }]);
dataIndex : 'is_deletable',
hidden : true,
hideable : false
}, {
dataIndex : 'is_editable',
hidden : true,
hideable : false
}, {
dataIndex : 'id',
hidden : true,
hideable : false
} ]);
// by default columns are sortable //By default columns are sortable
cm.defaultSortable = true; cm.defaultSortable = true;
function handleRowClick(sm, rowIndex) {//alert(rowIndex); function handleRowClick(sm, rowIndex) {//alert(rowIndex);
@@ -1267,7 +1267,7 @@ function loadDir() {
datastore.load({ datastore.load({
params : { params : {
start : 0, start : 0,
limit : 25, limit : 25,
dir : datastore.directory, dir : datastore.directory,
node : datastore.directory, node : datastore.directory,
option : 'gridDocuments', option : 'gridDocuments',
@@ -1290,11 +1290,11 @@ function rowContextMenu(grid, rowIndex, e, f) {
if (selections.length > 1) { if (selections.length > 1) {
// gridCtxMenu.items.get('gc_delete').enable(); // gridCtxMenu.items.get('gc_delete').enable();
gridCtxMenu.items.get('gc_delete')[ permitodelete==1 ? 'enable': 'disable'](); gridCtxMenu.items.get('gc_delete')[ permitodelete==1 ? 'enable': 'disable']();
gridCtxMenu.items.get('gc_rename').disable(); gridCtxMenu.items.get('gc_rename').disable();
gridCtxMenu.items.get('gc_download').disable(); gridCtxMenu.items.get('gc_download').disable();
} else if (selections.length == 1) { } else if (selections.length == 1) {
gridCtxMenu.items.get('gc_delete')[ permitodelete==1 ? 'enable': 'disable'](); gridCtxMenu.items.get('gc_delete')[ permitodelete==1 ? 'enable': 'disable']();
// gridCtxMenu.items.get('gc_delete')[selections[0].get('is_deletable') ? 'enable': 'disable'](); // gridCtxMenu.items.get('gc_delete')[selections[0].get('is_deletable') ? 'enable': 'disable']();
gridCtxMenu.items.get('gc_rename')[selections[0].get('is_deletable') ? 'disable': 'disable'](); gridCtxMenu.items.get('gc_rename')[selections[0].get('is_deletable') ? 'disable': 'disable']();
gridCtxMenu.items.get('gc_download')[selections[0].get('is_readable') gridCtxMenu.items.get('gc_download')[selections[0].get('is_readable')
@@ -1362,38 +1362,38 @@ gridCtxMenu = new Ext.menu.Menu({
} ] } ]
}); });
//function that used for measure the permissions and so assign buttons. //function that used for measure the permissions and so assign buttons.
function revisePermission(){ function revisePermission(){
dirCtxMenu.items.get('dirCtxMenu_reload').hide(); dirCtxMenu.items.get('dirCtxMenu_reload').hide();
gridCtxMenu.items.get('cancel').hide(); gridCtxMenu.items.get('cancel').hide();
dirCtxMenu.items.get('dirCtxMenu_cancel').hide(); dirCtxMenu.items.get('dirCtxMenu_cancel').hide();
if(permitoaddfolder=='1'){ if(permitoaddfolder=='1'){
gridtb.items.get('tb_new').show(); gridtb.items.get('tb_new').show();
// tb.items.get('tb_new').enable(); // tb.items.get('tb_new').enable();
//dirCtxMenu.items.get('dirCtxMenu_new').enable(); //dirCtxMenu.items.get('dirCtxMenu_new').enable();
} }
else{ else{
gridtb.items.get('tb_new').hide(); gridtb.items.get('tb_new').hide();
// tb.items.get('tb_new').disable(); // tb.items.get('tb_new').disable();
//dirCtxMenu.items.get('dirCtxMenu_new').disable(); //dirCtxMenu.items.get('dirCtxMenu_new').disable();
} }
if(permitodelete=='1') { if(permitodelete=='1') {
gridtb.items.get('tb_delete').show(); gridtb.items.get('tb_delete').show();
// tb.items.get('tb_delete').enable(); // tb.items.get('tb_delete').enable();
// dirCtxMenu.items.get('dirCtxMenu_remove').enable(); // dirCtxMenu.items.get('dirCtxMenu_remove').enable();
} }
else { else {
gridtb.items.get('tb_delete').hide(); gridtb.items.get('tb_delete').hide();
// tb.items.get('tb_delete').disable(); // tb.items.get('tb_delete').disable();
// dirCtxMenu.items.get('dirCtxMenu_remove').disable(); // dirCtxMenu.items.get('dirCtxMenu_remove').disable();
} }
if(permitoaddfile=='1')
if(permitoaddfile=='1')
gridtb.items.get('tb_upload').show(); gridtb.items.get('tb_upload').show();
else else
gridtb.items.get('tb_upload').hide(); gridtb.items.get('tb_upload').hide();
@@ -1418,7 +1418,7 @@ function dirContext(node, e) {
dirCtxMenu.items.get('dirCtxMenu_move')[node.attributes.id!='NA' ? 'enable' dirCtxMenu.items.get('dirCtxMenu_move')[node.attributes.id!='NA' ? 'enable'
: 'disable'](); : 'disable']();
// dirCtxMenu.items.get('dirCtxMenu_remove')[node.attributes.id!='NA' ? 'enable': 'disable'](); // dirCtxMenu.items.get('dirCtxMenu_remove')[node.attributes.id!='NA' ? 'enable': 'disable']();
dirCtxMenu.node = node; dirCtxMenu.node = node;
dirCtxMenu.show(e.getTarget(), 't-b?'); dirCtxMenu.show(e.getTarget(), 't-b?');
@@ -1450,7 +1450,7 @@ function copymove(action) {
handleCallback(requestParams); handleCallback(requestParams);
} }
} }
// context menus // context menus
var dirCtxMenu = new Ext.menu.Menu( var dirCtxMenu = new Ext.menu.Menu(
{ {
id : 'dirCtxMenu', id : 'dirCtxMenu',
@@ -1504,7 +1504,7 @@ var dirCtxMenu = new Ext.menu.Menu(
iconCls: 'button_menu_ext ss_sprite ss_folder_delete',// icon iconCls: 'button_menu_ext ss_sprite ss_folder_delete',// icon
// : // :
// '/images/documents/_editdelete.png', // '/images/documents/_editdelete.png',
text : TRANSLATIONS.ID_DELETE, text : TRANSLATIONS.ID_DELETE,
handler : function() { handler : function() {
dirCtxMenu.hide(); dirCtxMenu.hide();
@@ -1820,16 +1820,16 @@ var documentsTab = {
} }
} ]// another level } ]// another level
// } /* jj */] // } /* jj */]
} }
] ]
} ], } ],
listeners : { listeners : {
"afterlayout" : { "afterlayout" : {
fn : function() { fn : function() {
revisePermission(); revisePermission();
// alert(Ext.getCmp("locationbarcmp")); // alert(Ext.getCmp("locationbarcmp"));
// Ext.getCmp("documents"). // Ext.getCmp("documents").
/* /*
@@ -1839,20 +1839,20 @@ var documentsTab = {
* Ext.getCmp("dirTreePanel"); * Ext.getCmp("dirTreePanel");
* Ext.getCmp("locationbarcmp").initComponent(); * Ext.getCmp("locationbarcmp").initComponent();
* //console.log("location abr started"); return; } * //console.log("location abr started"); return; }
*/ */
// console.log(typeof(sw_afterlayout)); // console.log(typeof(sw_afterlayout));
sw_afterlayout=true; sw_afterlayout=true;
ext_itemgrid = Ext.getCmp("gridpanel"); ext_itemgrid = Ext.getCmp("gridpanel");
// console.log("variable ext_itemgrid created"); // console.log("variable ext_itemgrid created");
// console.trace(); // console.trace();
ext_itemgrid.un('celldblclick', ext_itemgrid.onCellDblClick); ext_itemgrid.un('celldblclick', ext_itemgrid.onCellDblClick);
// console.log("celldoublde click removed"); // console.log("celldoublde click removed");
dirTree = Ext.getCmp("dirTreePanel"); dirTree = Ext.getCmp("dirTreePanel");
// console.log("dirtree created"); // console.log("dirtree created");
/* /*
* dirTree.loader.on('load', function(loader, o, * dirTree.loader.on('load', function(loader, o,
* response ) { if( response && response.responseText ) { * response ) { if( response && response.responseText ) {
@@ -1883,9 +1883,9 @@ var documentsTab = {
Ext.getCmp("locationbarcmp").tree = Ext.getCmp("dirTreePanel"); Ext.getCmp("locationbarcmp").tree = Ext.getCmp("dirTreePanel");
Ext.getCmp("locationbarcmp").initComponent(); Ext.getCmp("locationbarcmp").initComponent();
// console.log("location abr started first time"); // console.log("location abr started first time");
} }
} }
} }