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

Merge remote branch 'upstream/master' into BUG-8038

Browse Source
This commit is contained in:
Marco Antonio Nina
2012-08-16 17:56:32 -04:00
parent 66a3f4a446 03fbc6cbb7
commit 5dc4e6bb28
22 changed files with 807 additions and 623 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
workflow/engine/xmlform/dynaforms/dynaforms_Properties.xml
View File

@@ -70,6 +70,7 @@
</PME_PROP_REVERT>
<sdfsdf type="javascript">
<![CDATA[
// added by gustavo cruz gustavo-at-colosa.com
// function getElementsByClassNameCrossBrowser
@@ -78,6 +79,12 @@
// @param node element or node
// @param tag tag of the class
if(document.getElementById("form[DYN_TYPE]").value=="grid"){
hideRowById('WIDTH');
hideRowById('NEXTSTEPSAVE');
hideRowById('PRINTDYNAFORM');
}
function getElementsByClassNameCrossBrowser(searchClass,node,tag) {
var classElements = new Array();
@@ -109,6 +116,9 @@ leimnud.event.add(getField('DYN_TYPE'), 'change', function() {
validateGridConversion(proUid,dynUid);
} else {
changeToolbar("xmlform");
showRowById('WIDTH');
showRowById('NEXTSTEPSAVE');
showRowById('PRINTDYNAFORM');
}
});
@@ -131,18 +141,19 @@ function validateGridConversion(proUid,dynUid){
oRPC.callback = function(oRPC) {
var response = oRPC.xmlhttp.responseText;
if (response=="ok"){
changeToolbar("grid");
changeToolbar("grid");
hideRowById('WIDTH');
hideRowById('NEXTSTEPSAVE');
hideRowById('PRINTDYNAFORM');
} else {
setDropdownSelection("form[DYN_TYPE]" , "xmlform");
msgBox("Grid forms can not contain the following fields: <br>" + response,"alert");
return false;
}
}.extend(this);
isTrue = oRPC.make();
isTrue = oRPC.make();
return isTrue;
};

109
workflow/engine/xmlform/dynaforms/fields/suggest.xml
View File

@@ -53,7 +53,7 @@ SELECT XMLNODE_NAME, TYPE FROM dynaForm WHERE XMLNODE_NAME = @@PME_XMLNODE_NAME
select XMLNODE_NAME, XMLNODE_NAME AS NAME FROM dynaForm WHERE XMLNODE_NAME <> @@PME_XMLNODE_NAME AND XMLNODE_NAME <> "" AND ( TYPE="text" or TYPE="textarea" or TYPE="dropdown" or TYPE="listbox" or TYPE="hidden" or TYPE="suggest")
]]><en>Dependent Fields<option name="">(none)</option></en>
</PME_DEPENDENTFIELDS>
<PME_HINT type="textarea" cols="44" rows="1">
<en>Hint</en>
</PME_HINT>
@@ -140,39 +140,44 @@ select XMLNODE_NAME, XMLNODE_NAME AS NAME FROM dynaForm WHERE XMLNODE_NAME <> @@
<en>Save</en>
</PME_ACCEPT>
<PME_JS type="javascript"><![CDATA[
<PME_JS type="javascript">
<![CDATA[
var fieldForm = "text";
var fieldName = getField("PME_XMLNODE_NAME", fieldForm);
var savedFieldName = fieldName.value;
var pme_validating;
var fieldForm="text";
var fieldName=getField("PME_XMLNODE_NAME",fieldForm);
var savedFieldName=fieldName.value;
var pme_validating;
fieldName.focus();
fieldName.select();
leimnud.event.add(fieldName, 'change', {method:dynaformVerifyFieldName, instance:fieldName, event:true});
var dyntype="@#PME_DYN_TYPE";
fieldName.focus();
fieldName.select();
leimnud.event.add(fieldName, "change", {method: dynaformVerifyFieldName, instance: fieldName, event: true});
storeNewEntriesOptions(getField('PME_STORE_NEW_ENTRY'));
leimnud.event.add(getField('PME_STORE_NEW_ENTRY'), 'click', function(){
storeNewEntriesOptions(this);
});
var dyntype = "@#PME_DYN_TYPE";
storeNewEntriesOptions(getField("PME_STORE_NEW_ENTRY"));
function storeNewEntriesOptions(o){
if(o.checked){
showRowById('PME_PRIMARY_KEY');
getTablesNames();
getTableFields()
getField('PME_TABLE').value = getField('PME_TABLE_DATA').value.trim();
getField('PME_PRIMARY_KEY').value = getField('PME_PRIMARY_KEY_DATA').value.trim();
getField('PME_PRIMARY_KEY_TYPE').value = getField('PME_PRIMARY_KEY_TYPE_DATA').value.trim();
} else {
hideRowById('PME_PRIMARY_KEY');
leimnud.event.add(
getField("PME_STORE_NEW_ENTRY"),
"click",
function ()
{
storeNewEntriesOptions(getField("PME_STORE_NEW_ENTRY"));
}
);
function storeNewEntriesOptions(o)
{
if (o.checked) {
showRowById("PME_PRIMARY_KEY");
getTablesNames();
getTableFields()
getField("PME_TABLE").value = getField("PME_TABLE_DATA").value.trim();
getField("PME_PRIMARY_KEY").value = getField("PME_PRIMARY_KEY_DATA").value.trim();
getField("PME_PRIMARY_KEY_TYPE").value = getField("PME_PRIMARY_KEY_TYPE_DATA").value.trim();
} else {
hideRowById("PME_PRIMARY_KEY");
}
}
}
leimnud.event.add(getField('PME_XMLNODE_VALUE'), 'keyup', function(){
getTablesNames();
@@ -198,9 +203,15 @@ select XMLNODE_NAME, XMLNODE_NAME AS NAME FROM dynaForm WHERE XMLNODE_NAME <> @@
getField('PME_PRIMARY_KEY_TYPE_DATA').value = this.value.trim();
});
function getTablesNames(){
var s0 = getField('PME_XMLNODE_VALUE').value;
var s = getField('PME_XMLNODE_VALUE').value.toUpperCase();
function getTablesNames() {
var strSql = getField("PME_XMLNODE_VALUE").value;
strSql = stringReplace("\\x0A", " ", strSql); //\n 10
strSql = stringReplace("\\x0D", " ", strSql); //\r 13
strSql = stringReplace("\\x09", " ", strSql); //\t 9
var s0 = strSql;
var s = strSql.toUpperCase();
p1 = s.indexOf(" FROM ");
if(p1 > 0){
@@ -218,7 +229,7 @@ select XMLNODE_NAME, XMLNODE_NAME AS NAME FROM dynaForm WHERE XMLNODE_NAME <> @@
ss = s0.substring(p1, p2);
ss = ss.replace("FROM", "").trim();
ss = ss.replace("from", "").trim();
aTables = ss.split(',');
otable = getField('PME_TABLE');
@@ -230,16 +241,26 @@ select XMLNODE_NAME, XMLNODE_NAME AS NAME FROM dynaForm WHERE XMLNODE_NAME <> @@
var newOption = new Option("", "0");
otable.options[0] = newOption;
for(i=0; i<aTables.length; i++){
var newOption = new Option(aTables[i], aTables[i]);
otable.options[i+1] = newOption;
var t = "";
for (var i = 0; i <= aTables.length - 1; i++) {
t = aTables[i].trim();
var newOption = new Option(t, t);
otable.options[i + 1] = newOption;
}
}
}
function getTableFields(){
var s0 = getField('PME_XMLNODE_VALUE').value;
var s = getField('PME_XMLNODE_VALUE').value.toUpperCase();
function getTableFields() {
var strSql = getField("PME_XMLNODE_VALUE").value;
strSql = stringReplace("\\x0A", " ", strSql); //\n 10
strSql = stringReplace("\\x0D", " ", strSql); //\r 13
strSql = stringReplace("\\x09", " ", strSql); //\t 9
var s0 = strSql;
var s = strSql.toUpperCase();
p1 = s.indexOf("SELECT ");
if(p1 >= 0){
@@ -258,9 +279,13 @@ select XMLNODE_NAME, XMLNODE_NAME AS NAME FROM dynaForm WHERE XMLNODE_NAME <> @@
var newOption = new Option("", "0");
otable.options[0] = newOption;
for(i=0; i<aTables.length; i++){
var newOption = new Option(aTables[i], aTables[i]);
otable.options[i+1] = newOption;
var t = "";
for (var i = 0; i <= aTables.length - 1; i++) {
t = aTables[i].trim();
var newOption = new Option(t, t);
otable.options[i + 1] = newOption;
}
}
}
@@ -283,4 +308,4 @@ function cancel(){
}
]]></PME_JS>
</dynaForm>
</dynaForm>

107
workflow/engine/xmlform/roles/roles_Options.xml
View File

@@ -33,27 +33,27 @@ function saveNewRole()
new leimnud.module.app.alert().make({label: G_STRINGS.ID_ROLES_MSG3});
return false;
}
var uri = 'request=verifyNewRole&code='+code;
var ajax = AJAX();
ajax.open("POST", PROCESS_REQUEST_FILE, true);
ajax.setRequestHeader("Content-Type", "application/x-www-form-urlencoded;");
ajax.onreadystatechange = function() {
ajax.setRequestHeader("Content-Type", "application/x-www-form-urlencoded;");
ajax.onreadystatechange = function() {
if(ajax.readyState == 4) {
if(eval(ajax.responseText.trim())){
try{
parent = $('form[ROL_PARENT]').value;
}catch(e){}
code = $('form[ROL_CODE]').value;
status = $('form[ROL_STATUS]').value;
var uri = 'request=saveNewRole&code='+code+'&parent='+parent+'&status='+status+'&name='+name;
var uri = 'request=saveNewRole&code='+code+'&parent='+parent+'&status='+status+'&name='+name;
var oRPC = new leimnud.module.rpc.xmlhttp({
url : PROCESS_REQUEST_FILE,
args: uri
});
oRPC.callback = function(rpc){
var oRPC = new leimnud.module.rpc.xmlhttp({
url : PROCESS_REQUEST_FILE,
@@ -62,38 +62,38 @@ function saveNewRole()
args : 'request=show&r='+Math.random()
});
oRPC.make();
$('publisherContent[0]').innerHTML = oRPC.xmlhttp.responseText;
$('publisherContent[0]').innerHTML = oRPC.xmlhttp.responseText;
window.location = 'roles_List';
}.extend(this);
oRPC.make();
currentPopupWindow.remove();
}
if(!eval(ajax.responseText.trim())){
new leimnud.module.app.alert().make({label: G_STRINGS.ID_ROLES_MSG2});
return false;
}
}
}
}
ajax.send(uri);
}
function editRole(ROL_UID)
{
{
if(ROL_UID!='00000000000000000000000000000002')
{
var uri = 'request=editRole&ROL_UID='+ROL_UID;
{
var uri = 'request=editRole&ROL_UID='+ROL_UID;
popupWindow('', '../roles/roles_Ajax?'+uri, 350, 265);
}
else
{
new leimnud.module.app.alert().make({label: G_STRINGS.ID_ROLES_MSG});
}
{
new leimnud.module.app.alert().make({label: G_STRINGS.ID_ROLES_MSG});
}
}
function updateRole(ROL_UID) {
code = $('form[ROL_CODE]').value;
name = $('form[ROL_NAME]').value;
if(code == '') {
@@ -111,16 +111,16 @@ function updateRole(ROL_UID) {
try{
parent = $('form[ROL_PARENT]').value;
}catch(e){}
status = $('form[ROL_STATUS]').value;
var uri = 'request=updateRole&code='+code+'&parent='+parent+'&status='+status+'&rol_uid='+ROL_UID+'&name='+name;
var uri = 'request=updateRole&code='+code+'&parent='+parent+'&status='+status+'&rol_uid='+ROL_UID+'&name='+name;
var oRPC = new leimnud.module.rpc.xmlhttp({
url : PROCESS_REQUEST_FILE,
args: uri
});
oRPC.callback = function(rpc){
var oRPC = new leimnud.module.rpc.xmlhttp({
url : PROCESS_REQUEST_FILE,
@@ -140,21 +140,21 @@ function deleteRole(ROL_UID) {
var uri = 'request=canDeleteRole&ROL_UID='+ROL_UID;
var ajax = AJAX();
ajax.open("POST", PROCESS_REQUEST_FILE, true);
ajax.setRequestHeader("Content-Type", "application/x-www-form-urlencoded;");
ajax.onreadystatechange = function() {
ajax.setRequestHeader("Content-Type", "application/x-www-form-urlencoded;");
ajax.onreadystatechange = function() {
if(ajax.readyState == 4) {
if(eval(ajax.responseText.trim())){
if(eval(ajax.responseText.trim())){
new leimnud.module.app.confirm().make({
label:G_STRINGS.ID_REMOVE_ROLE,
action:function() {
var uri = 'request=deleteRole&ROL_UID='+ROL_UID;
var uri = 'request=deleteRole&ROL_UID='+ROL_UID;
var oRPC = new leimnud.module.rpc.xmlhttp({
url : PROCESS_REQUEST_FILE,
args: uri
});
oRPC.callback = function(rpc){
var oRPC = new leimnud.module.rpc.xmlhttp({
url : PROCESS_REQUEST_FILE,
@@ -167,16 +167,16 @@ function deleteRole(ROL_UID) {
window.location = 'roles_List';
}.extend(this);
oRPC.make();
}.extend(this)
});
}
}
else
{
new leimnud.module.app.alert().make({label: G_STRINGS.ID_ROLES_CAN_NOT_DELETE});
return false;
}
}
}
}
ajax.send(uri);
};
@@ -189,7 +189,7 @@ function usersIntoRole(ROL_UID)
}
function deleteUserRole(ROL_UID, USR_UID){
new leimnud.module.app.confirm().make({
label:G_STRINGS.ID_MSG_CONFIRM,
action:function(){
@@ -219,7 +219,7 @@ oPanel = new leimnud.module.panel();
fx :{modal:true,opacity:true,blinkToFront:false,fadeIn:false,drag:true}
};
oPanel.events = {
remove: function() {
remove: function() {
delete(oPanel);
resetChecks();
}.extend(this)
@@ -237,7 +237,7 @@ oPanel = new leimnud.module.panel();
});
oRPC.make();
currentPopupWindow.clearContent();
currentPopupWindow.addContent(oRPC.xmlhttp.responseText);
currentPopupWindow.addContent(oRPC.xmlhttp.responseText);
}
var checks_selected_Rolid = new Array();
function showUsersLoad( ROL_UID ){
@@ -253,7 +253,7 @@ function showUsersLoad( ROL_UID ){
fx :{modal:true,opacity:true,blinkToFront:false,fadeIn:false,drag:true}
};
oPanel.events = {
remove: function() {
remove: function() {
delete(oPanel);
resetChecks();
}.extend(this)
@@ -267,7 +267,7 @@ function showUsersLoad( ROL_UID ){
});
//currentPopupWindow.clearContent();
//currentPopupWindow.addContent(oRPC.xmlhttp.responseText);
//currentPopupWindow.addContent(oRPC.xmlhttp.responseText);
checks_selected_Rolid.push(ROL_UID);
oRPC.callback = function(rpc) {
oPanel.loader.hide();
@@ -287,11 +287,11 @@ function showUsersLoad( ROL_UID ){
};
}catch(e){alert(e)}
}
}
}
}.extend(this);
oRPC.make();
}
function assignUserToRole(ROL_UID, USR_UID)
{
@@ -303,13 +303,13 @@ function assignUserToRole(ROL_UID, USR_UID)
});
oRPC.make();
currentPopupWindow.clearContent();
currentPopupWindow.addContent(oRPC.xmlhttp.responseText);
currentPopupWindow.addContent(oRPC.xmlhttp.responseText);
}
function viewPermitions(ROL_UID)
{
var uri = 'request=viewPermitions&ROL_UID='+ROL_UID;
popupWindow('', '../roles/roles_Ajax?'+uri, 500, 450);
popupWindow('', '../roles/roles_Ajax?'+uri, 500, 450);
}
function showPermissions(ROL_UID)
@@ -327,7 +327,7 @@ function showPermissions(ROL_UID)
function assignPermissionToRole(ROL_UID, PER_UID)
{
var oRPC = new leimnud.module.rpc.xmlhttp({
url : PROCESS_REQUEST_FILE,
async : false,
@@ -336,11 +336,11 @@ function assignPermissionToRole(ROL_UID, PER_UID)
});
oRPC.make();
currentPopupWindow.clearContent();
currentPopupWindow.addContent(oRPC.xmlhttp.responseText);
currentPopupWindow.addContent(oRPC.xmlhttp.responseText);
}
function deletePermissionRole(ROL_UID, PER_UID){
new leimnud.module.app.confirm().make({
label:G_STRINGS.ID_MSG_CONFIRM,
action:function(){
@@ -382,14 +382,14 @@ function backUsers(ROL_UID)
currentPopupWindow.clearContent();
currentPopupWindow.addContent(oRPC.xmlhttp.responseText);
}
function AJAX()
function AJAX()
{
try {
xmlhttp = new XMLHttpRequest();
}
}
catch(generic_error) {
try {
xmlhttp = new ActiveXObject("Msxml2.XMLHTTP");
@@ -403,10 +403,9 @@ function AJAX()
}
return xmlhttp;
}
String.prototype.trim = function()
{
return this.replace(/^\s+|\s+get/g,"");
String.prototype.trim = function () {
return this.replace(/^\s+|\s+$/g, "");
}
function $(id){
@@ -433,7 +432,7 @@ function saveUsers(){
resetChecks();
oRPC.make();
currentPopupWindow.remove();
usersIntoRole(rolUid);
}

6
workflow/engine/xmlform/steps/conditions_Edit.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<dynaForm name="dynaforms_Edit" type="xmlform" width="98%" labelWidth="62px">
<dynaForm name="dynaforms_Edit" type="xmlform" width="98%" labelWidth="400px">
<STEP_UID type="hidden" showInTable="0"/>
@@ -7,7 +7,7 @@
<TAS_UID type="hidden" showInTable="0"/>
<STEP_CONDITION type="textareapm" cols="62" rows="5" showVars="1" process="@#PRO_UID">
<STEP_CONDITION type="textareapm" cols="50" rows="5" showVars="1" process="@#PRO_UID">
<en>Condition</en>
</STEP_CONDITION>
@@ -71,4 +71,4 @@ var insertFormVar = function(sFieldName, sValue) {
]]></JS>
</dynaForm>
</dynaForm>

10
workflow/engine/xmlform/steps/conditions_Options.xml
View File

@@ -9,15 +9,15 @@
<JS type="javascript" replaceTags="1">
function editCondition(uid, sStepTitle)
{
popupWindow('@G::LoadTranslation(ID_EDIT_CONDITIONS_OF_STEP)' + ': ' + sStepTitle, '@G::encryptLink(@#URL_CONDITIONS_EDIT)?UID='+ uid , 500, 216);
popupWindow("@G::LoadTranslation(ID_EDIT_CONDITIONS_OF_STEP)" + ": " + sStepTitle, "@G::encryptLink(@#URL_CONDITIONS_EDIT)?UID=" + uid , 535, 240);
}
function saveCondition(oForm)
{
ajax_post(oForm.action, oForm, 'POST');
currentPopupWindow.remove();
@#PAGED_TABLE_ID.refresh();
ajax_post(oForm.action, oForm, "POST");
currentPopupWindow.remove();
@#PAGED_TABLE_ID.refresh();
}
</JS>
</dynaForm>
</dynaForm>