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

Merged in dheeyi/processmaker/PM-865 (pull request #1673)

Browse Source 
PM-864, PM-865, PM-805 y PM-1848
This commit is contained in:
Julio Cesar Laura Avendaño
2015-03-17 23:13:32 -04:00
parent 9b8d2c7ff6 28cd3411ad
commit 0e8f3f483a
2 changed files with 34 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1739,6 +1739,16 @@ function copymoveCtx(e) {
copymove('moveExecute');
}
var loader = new Ext.tree.TreeLoader({
preloadChildren : true,
dataUrl : '../appFolder/appFolderAjax.php',
baseParams : {
action : 'expandNode',
sendWhat : 'dirs',
renderTree : 1
}
});
var documentsTab = {
id : 'documents',
// title : 'Documents',
@@ -1772,15 +1782,7 @@ var documentsTab = {
}
],
// rootVisible: false,
loader : new Ext.tree.TreeLoader({
preloadChildren : true,
dataUrl : '../appFolder/appFolderAjax.php',
baseParams : {
action : 'expandNode',
sendWhat : 'dirs',
renderTree : 1
}
}),
loader : loader,
containerScroll : true,
enableDD : true,
ddGroup : 'TreeDD',
@@ -1834,7 +1836,7 @@ var documentsTab = {
return true;
}
},
'beforenodedrop' : {
'nodedrop' : {
fn : function(e) {
dropEvent = e;
copymoveCtx(e);

21
workflow/engine/templates/oauth2/clientSetup.js
View File

@@ -289,7 +289,11 @@ clientSetup.application = {
id: "txtName",
name: "txtName",
fieldLabel: "Name"
fieldLabel: "Name",
validator: function(value){
var val = (value=='')? false: true;
return val;
}
},
{
xtype: "label",
@@ -321,7 +325,14 @@ clientSetup.application = {
name: "txtWebSite",
fieldLabel: "Web Site",
vtype: "url"
validator: function (value){
var regexpUrl = /[-a-zA-Z0-9@:%_\+.~#?&//=]{2,256}\.[a-z]{2,4}\b(\/[-a-zA-Z0-9@:%_\+.~#?&//=]*)?/gi;
var regexStringIp = new RegExp(regexpUrl);
var regexpIpAdress = /^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]).){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$/g;
var regexNumberIp = new RegExp(regexpIpAdress);
var result = (value.match(regexStringIp) || value.match(regexNumberIp))? true : false;
return result;
}
},
{
xtype: "label",
@@ -345,7 +356,7 @@ clientSetup.application = {
fieldLabel: " ",
labelSeparator: "",
html: "<span style=\"font-size: 11px;\">" + "here should we return after successfully authenticating? For @Anywhere applications, only the domain specified in the callback will be used. OAuth 1.0a applications should explicitly specify their oauth_callback URL on the request token step, regardless of the value given here. To restrict your application from using callbacks, leave this field blank." + "</span>"
html: "<span style=\"font-size: 11px;\">" + "URL where redirected after successfully authenticating (calling the {workspace}/oauth2/authorize endpoint). This URL typically contains code to get the access token from the {workspace}/oauth2/token endpoint. To prevent your application from using callbacks, leave this field blank." + "</span>"
}
]
})
@@ -499,7 +510,7 @@ clientSetup.application = {
var btnDetail = new Ext.Action({
id: "btnDetail",
text: _("ID_DETAIL"),
text: _("ID_DETAILS"),
iconCls: "button_menu_ext ss_sprite ss_zoom",
handler: function ()
@@ -695,7 +706,7 @@ clientSetup.application = {
items: [grdpnlMain]
});
}
}
Ext.onReady(clientSetup.application.init, clientSetup.application);