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

BUG 9558 "Suggest field functionality is not intuitive..." SOLVED

Browse Source 
- New feature, change SUGGEST field behavior for the insertion of
  a new record
- SUGGEST displays a temporary message to be placed in this field
- SUGGEST when you insert a new record to the database, it displays
  a popup message indicating the insertion
- SUGGEST this field allows the insertion of a new record by pressing
  the key Intro
- Is improved SUGGEST field behavior (when there are results, and when
  there are none)
- Problem solved by adding the SUGGEST field in the Dynaform (in the
  editor DynaForms) this in IE, when ckeck the option "Store new entry"
- Problem solved in method "String.prototype.trim" (JavaScript)
This commit is contained in:
Victor Saisa Lopez
2012-08-16 15:37:15 -04:00
parent 3ca7bbaa5f
commit 41f9312f7a
10 changed files with 494 additions and 388 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
gulliver/js/common/core/common.js
View File

@@ -1785,8 +1785,8 @@ function highlightRow(o, color){
* @Param <none> * @Param <none>
* @Return <none> * @Return <none>
*/ */
String.prototype.trim = function() { String.prototype.trim = function () {
return this.replace(/^\s+|\s+get/g,""); return this.replace(/^\s+|\s+$/g, "");
} }
function clearCalendar(id){ function clearCalendar(id){
@@ -2114,10 +2114,21 @@ function _()
return trn; return trn;
} }
/**
* String Replace function, if StrSearch has special characters "(", "[", must be escape "\\(", "\\[".
*/
function stringReplace(strSearch, stringReplace, str)
{
var expression = eval("/" + strSearch + "/g");
return str.replace(expression, stringReplace);
}
var mb_strlen = function(str) { var mb_strlen = function(str) {
var len = 0; var len = 0;
for (var i = 0; i < str.length; i++) { for (var i = 0; i < str.length; i++) {
len += str.charCodeAt(i) < 0 || str.charCodeAt(i) > 255 ? 2 : 1; len += str.charCodeAt(i) < 0 || str.charCodeAt(i) > 255 ? 2 : 1;
} }
return len; return len;
}; };

5
gulliver/js/ext/pmos-common.js
View File

@@ -473,9 +473,8 @@ Ext.util.Format.capitalize = (function(){
/** /**
* left and right delete the blank characteres (String prototype) * left and right delete the blank characteres (String prototype)
*/ */
String.prototype.trim = function() { String.prototype.trim = function () {
return this.replace(/^\s+|\s+get/g,""); return this.replace(/^\s+|\s+$/g, "");
//return Ext.util.Format.trim(this);
} }
String.prototype.nl2br = function () { String.prototype.nl2br = function () {

14
gulliver/js/form/core/form.js
View File

@@ -1060,7 +1060,7 @@ function G_Text(form, element, name)
tamMask = aux[0].length; tamMask = aux[0].length;
sw = true; sw = true;
} }
if (tamData >= tamMask){ if (tamData >= tamMask){
var minusExi; var minusExi;
for (var numI = 0; newValue.length > numI; numI++) { for (var numI = 0; newValue.length > numI; numI++) {
var campVal = newValue[numI]; var campVal = newValue[numI];
@@ -1073,7 +1073,7 @@ function G_Text(form, element, name)
} }
} }
} }
if (!(keyCode == 45 || (minusExi && tamMask >= tamData))) { if (!(keyCode == 45 || (minusExi && tamMask >= tamData))) {
if (sw && !swPeriod && testData.indexOf(me.comma_separator) == -1){ if (sw && !swPeriod && testData.indexOf(me.comma_separator) == -1){
action = 'none'; action = 'none';
@@ -1081,7 +1081,7 @@ function G_Text(form, element, name)
if (!sw) action = 'none'; if (!sw) action = 'none';
} }
} }
} }
switch(action){ switch(action){
case 'mask': case 'move': case 'mask': case 'move':
dataNewMask = me.replaceMasks(newValue, newCursor); dataNewMask = me.replaceMasks(newValue, newCursor);
@@ -3547,11 +3547,5 @@ function dateSetMask(mask) {
return mask; return mask;
} }
function stringReplace(strSearch, stringReplace, str)
{
var expression = eval("/" + strSearch + "/g");
return str.replace(expression, stringReplace);
}
/* end file */ /* end file */

442
gulliver/js/widgets/suggest/bsn.AutoSuggest_2.1.3.js
View File

@@ -11,6 +11,7 @@
//static variable for suggest responses. @By Erik <erik@colosa.com> //static variable for suggest responses. @By Erik <erik@colosa.com>
var Static_AutosuggestResponseData; var Static_AutosuggestResponseData;
var swStoreEntry = 1;
if (typeof(bsn) == "undefined") if (typeof(bsn) == "undefined")
@@ -28,7 +29,7 @@ _b.AutoSuggest = function (id, param)
// //
if (!document.getElementById) if (!document.getElementById)
return 0; return 0;
// get field via DOM // get field via DOM
// //
this.fld = _b.DOM.gE(id); this.fld = _b.DOM.gE(id);
@@ -42,12 +43,12 @@ _b.AutoSuggest = function (id, param)
this.nInpC = 0; this.nInpC = 0;
this.aSug = []; this.aSug = [];
this.iHigh = 0; this.iHigh = 0;
// parameters object // parameters object
// //
this.oP = param ? param : {}; this.oP = param ? param : {};
// defaults // defaults
// //
var k, def = {minchars:1, meth:"get", varname:"input", className:"autosuggest", timeout:5000, delay:50, offsety:-5, shownoresults: true, noresults: "No results!", maxheight: 250, cache: true, maxentries: 25}; var k, def = {minchars:1, meth:"get", varname:"input", className:"autosuggest", timeout:5000, delay:50, offsety:-5, shownoresults: true, noresults: "No results!", maxheight: 250, cache: true, maxentries: 25};
//timeout::2500 //delay was modified of 5000 or 500 by 5, I don't sure.. ;) can't remember... <-erik notes->' //timeout::2500 //delay was modified of 5000 or 500 by 5, I don't sure.. ;) can't remember... <-erik notes->'
@@ -56,107 +57,124 @@ _b.AutoSuggest = function (id, param)
if (typeof(this.oP[k]) != typeof(def[k])) if (typeof(this.oP[k]) != typeof(def[k]))
this.oP[k] = def[k]; this.oP[k] = def[k];
} }
// set keyup handler for field // set keyup handler for field
// and prevent autocomplete from client // and prevent autocomplete from client
// //
var p = this; var p = this;
// NOTE: not using addEventListener because UpArrow fired twice in Safari // NOTE: not using addEventListener because UpArrow fired twice in Safari
//_b.DOM.addEvent( this.fld, 'keyup', function(ev){ return pointer.onKeyPress(ev); } ); //_b.DOM.addEvent( this.fld, 'keyup', function(ev){ return pointer.onKeyPress(ev); } );
this.fld.onkeypress = function(ev){ return p.onKeyPress(ev); }; this.fld.onkeypress = function(ev){ return p.onKeyPress(ev); };
this.fld.onkeyup = function(ev){ return p.onKeyUp(ev); }; this.fld.onkeyup = function(ev){ return p.onKeyUp(ev); };
this.fld.setAttribute("autocomplete","off"); this.fld.setAttribute("autocomplete","off");
}; };
_b.AutoSuggest.prototype.onKeyPress = function(ev) _b.AutoSuggest.prototype.onKeyPress = function (ev)
{ {
var key = (window.event)? window.event.keyCode : ev.keyCode;
var key = (window.event) ? window.event.keyCode : ev.keyCode;
var RETURN = 13; var RETURN = 13;
var TAB = 9; var TAB = 9;
var ESC = 27; var ESC = 27;
var bubble = 1;
switch(key) var bubble = 1;
{
case RETURN:
this.setHighlightedValue();
bubble = 0;
//added by erik, this is for enter press, no new line into text area
return false;
break;
case ESC: switch (key) {
this.clearSuggestions(); case RETURN:
break; if (typeof this.oP.storeEntryData != "undefined" && this.oP.storeEntryData[0] == 1) {
} var elem = document.getElementById(this.oP.storeEntryData[1]);
return bubble; if (elem.value != "" && swStoreEntry == 1 &&
typeof Static_AutosuggestResponseData != "undefined" && Static_AutosuggestResponseData.results.length > 0
) {
for (var i = 0 ; i <= Static_AutosuggestResponseData.results.length - 1; i++) {
if (Static_AutosuggestResponseData.results[i].value == elem.value) {
swStoreEntry = 0;
}
}
}
if (elem.value == "") {
swStoreEntry = 0;
}
if (swStoreEntry == 1) {
storeEntryProcessAjax(
elem,
this.oP.storeEntryData[2],
this.oP.storeEntryData[3],
this.oP.storeEntryData[4],
this.oP.storeEntryData[5],
this.oP.storeEntryData[6]
);
}
}
this.setHighlightedValue();
bubble = 0;
//added by erik, this is for enter press, no new line into text area
return false;
break;
case ESC:
this.clearSuggestions();
break;
default:
swStoreEntry = 1;
break;
}
return bubble;
}; };
_b.AutoSuggest.prototype.onKeyUp = function (ev)
_b.AutoSuggest.prototype.onKeyUp = function(ev)
{ {
var key = (window.event) ? window.event.keyCode : ev.keyCode; var key = (window.event)? window.event.keyCode : ev.keyCode;
var ARRUP = 38; var ARRUP = 38;
var ARRDN = 40; var ARRDN = 40;
var bubble = 1;
switch(key) var bubble = 1;
{
case ARRUP:
this.changeHighlight(key);
this.setHighlightedValue2();
bubble = 0;
break;
switch (key) {
case ARRUP:
this.changeHighlight(key);
this.setHighlightedValue2();
bubble = 0;
swStoreEntry = 0;
break;
case ARRDN:
this.changeHighlight(key);
this.setHighlightedValue2();
bubble = 0;
swStoreEntry = 0;
break;
default:
this.getSuggestions(this.fld.value);
break;
}
case ARRDN: return bubble;
this.changeHighlight(key);
this.setHighlightedValue2();
bubble = 0;
break;
default:
this.getSuggestions(this.fld.value);
}
return bubble;
}; };
_b.AutoSuggest.prototype.getSuggestions = function (val) _b.AutoSuggest.prototype.getSuggestions = function (val)
{ {
// if input stays the same, do nothing // if input stays the same, do nothing
// //
if (val == this.sInp) if (val == this.sInp)
return 0; return 0;
// kill list // kill list
// //
_b.DOM.remE(this.idAs); _b.DOM.remE(this.idAs);
this.sInp = val; this.sInp = val;
// input length is less than the min required to trigger a request // input length is less than the min required to trigger a request
// do nothing // do nothing
// //
@@ -166,7 +184,7 @@ _b.AutoSuggest.prototype.getSuggestions = function (val)
this.nInpC = val.length; this.nInpC = val.length;
return 0; return 0;
} }
var ol = this.nInpC; // old length var ol = this.nInpC; // old length
this.nInpC = val.length ? val.length : 0; this.nInpC = val.length ? val.length : 0;
@@ -185,7 +203,7 @@ _b.AutoSuggest.prototype.getSuggestions = function (val)
arr.push( this.aSug[i] ); arr.push( this.aSug[i] );
} }
this.aSug = arr; this.aSug = arr;
this.createList(this.aSug); this.createList(this.aSug);
return false; return false;
} }
@@ -221,13 +239,13 @@ _b.AutoSuggest.prototype.doAjaxRequest = function (input)
var url = this.oP.script(encodeURIComponent(this.sInp)); var url = this.oP.script(encodeURIComponent(this.sInp));
else else
var url = this.oP.script+this.oP.varname+"="+encodeURIComponent(this.sInp); var url = this.oP.script+this.oP.varname+"="+encodeURIComponent(this.sInp);
if (!url) if (!url)
return false; return false;
var meth = this.oP.meth; var meth = this.oP.meth;
var input = this.sInp; var input = this.sInp;
var onSuccessFunc = function (req) { pointer.setSuggestions(req, input) }; var onSuccessFunc = function (req) { pointer.setSuggestions(req, input) };
var onErrorFunc = function (status) { alert("AJAX error: "+status); }; var onErrorFunc = function (status) { alert("AJAX error: "+status); };
@@ -244,15 +262,15 @@ _b.AutoSuggest.prototype.setSuggestions = function (req, input)
return false; return false;
this.aSug = []; this.aSug = [];
if (this.oP.json) if (this.oP.json)
{ {
var jsondata = eval('(' + req.responseText + ')'); var jsondata = eval('(' + req.responseText + ')');
if( jsondata.status == 0 ){ if( jsondata.status == 0 ){
Static_AutosuggestResponseData = jsondata; Static_AutosuggestResponseData = jsondata;
for (var i=0;i<jsondata.results.length;i++) for (var i=0;i<jsondata.results.length;i++)
@@ -268,7 +286,7 @@ _b.AutoSuggest.prototype.setSuggestions = function (req, input)
{ {
var xml = req.responseXML; var xml = req.responseXML;
// traverse xml // traverse xml
// //
var results = xml.getElementsByTagName('results')[0].childNodes; var results = xml.getElementsByTagName('results')[0].childNodes;
@@ -278,11 +296,11 @@ _b.AutoSuggest.prototype.setSuggestions = function (req, input)
if (results[i].hasChildNodes()) if (results[i].hasChildNodes())
this.aSug.push( { 'id':results[i].getAttribute('id'), 'value':results[i].childNodes[0].nodeValue, 'info':results[i].getAttribute('info') } ); this.aSug.push( { 'id':results[i].getAttribute('id'), 'value':results[i].childNodes[0].nodeValue, 'info':results[i].getAttribute('info') } );
} }
} }
this.idAs = "as_"+this.fld.id; this.idAs = "as_"+this.fld.id;
this.createList(this.aSug); this.createList(this.aSug);
@@ -294,8 +312,8 @@ _b.AutoSuggest.prototype.createList = function(arr)
_b.DOM.remE(this.idAs); _b.DOM.remE(this.idAs);
this.killTimeout(); this.killTimeout();
// if no results, and shownoresults is false, do nothing // if no results, and shownoresults is false, do nothing
// //
if (arr.length == 0 && !this.oP.shownoresults) if (arr.length == 0 && !this.oP.shownoresults)
@@ -303,15 +321,15 @@ _b.AutoSuggest.prototype.createList = function(arr)
// create holding div // create holding div
// //
var div = _b.DOM.cE("div", {id:this.idAs, className:this.oP.className}); var div = _b.DOM.cE("div", {id:this.idAs, className:this.oP.className});
var hcorner = _b.DOM.cE("div", {className:"as_corner"}); var hcorner = _b.DOM.cE("div", {className:"as_corner"});
var hbar = _b.DOM.cE("div", {className:"as_bar"}); var hbar = _b.DOM.cE("div", {className:"as_bar"});
var header = _b.DOM.cE("div", {className:"as_header"}); var header = _b.DOM.cE("div", {className:"as_header"});
header.appendChild(hcorner); header.appendChild(hcorner);
header.appendChild(hbar); header.appendChild(hbar);
div.appendChild(header); div.appendChild(header);
// create and populate ul // create and populate ul
// //
var ul = _b.DOM.cE("ul", {id:"as_ul"}); var ul = _b.DOM.cE("ul", {id:"as_ul"});
@@ -327,8 +345,8 @@ _b.AutoSuggest.prototype.createList = function(arr)
var val = arr[i].value; var val = arr[i].value;
var st = val.toLowerCase().indexOf( this.sInp.toLowerCase() ); var st = val.toLowerCase().indexOf( this.sInp.toLowerCase() );
var output = val.substring(0,st) + "<em>" + val.substring(st, st+this.sInp.length) + "</em>" + val.substring(st+this.sInp.length); var output = val.substring(0,st) + "<em>" + val.substring(st, st+this.sInp.length) + "</em>" + val.substring(st+this.sInp.length);
var span = _b.DOM.cE("span", {}, output, true); var span = _b.DOM.cE("span", {}, output, true);
if (arr[i].info != "") if (arr[i].info != "")
{ {
@@ -337,46 +355,46 @@ _b.AutoSuggest.prototype.createList = function(arr)
var small = _b.DOM.cE("small", {}, arr[i].info); var small = _b.DOM.cE("small", {}, arr[i].info);
span.appendChild(small); span.appendChild(small);
} }
var a = _b.DOM.cE("a", { href:"#" }); var a = _b.DOM.cE("a", { href:"#" });
var tl = _b.DOM.cE("span", {className:"tl"}, " "); var tl = _b.DOM.cE("span", {className:"tl"}, " ");
var tr = _b.DOM.cE("span", {className:"tr"}, " "); var tr = _b.DOM.cE("span", {className:"tr"}, " ");
a.appendChild(tl); a.appendChild(tl);
a.appendChild(tr); a.appendChild(tr);
a.appendChild(span); a.appendChild(span);
a.name = i+1; a.name = i+1;
a.onclick = function () { pointer.setHighlightedValue(); return false; }; a.onclick = function () { pointer.setHighlightedValue(); return false; };
a.onmouseover = function () { a.onmouseover = function () {
pointer.setHighlight(this.name); pointer.setHighlight(this.name);
// Commented by Bug 6672 // Commented by Bug 6672
// pointer.setHighlightedValue2(); // pointer.setHighlightedValue2();
}; };
var li = _b.DOM.cE( "li", {}, a ); var li = _b.DOM.cE( "li", {}, a );
ul.appendChild( li ); ul.appendChild( li );
} }
// no results // no results
// //
if (arr.length == 0 && this.oP.shownoresults) if (arr.length == 0 && this.oP.shownoresults)
{ {
var li = _b.DOM.cE( "li", {className:"as_warning"}, this.oP.noresults ); var li = _b.DOM.cE( "li", {className:"as_warning"}, this.oP.noresults );
ul.appendChild( li ); ul.appendChild( li );
//By Erik AO <erik@colosa.com> //By Erik AO <erik@colosa.com>
Static_AutosuggestResponseData.results.length = 0; Static_AutosuggestResponseData.results.length = 0;
} }
div.appendChild( ul ); div.appendChild( ul );
var fcorner = _b.DOM.cE("div", {className:"as_corner"}); var fcorner = _b.DOM.cE("div", {className:"as_corner"});
var fbar = _b.DOM.cE("div", {className:"as_bar"}); var fbar = _b.DOM.cE("div", {className:"as_bar"});
var footer = _b.DOM.cE("div", {className:"as_footer"}); var footer = _b.DOM.cE("div", {className:"as_footer"});
@@ -389,7 +407,7 @@ _b.AutoSuggest.prototype.createList = function(arr)
// set width of holding div to width of field // set width of holding div to width of field
// //
var pos = _b.DOM.getPos(this.fld); var pos = _b.DOM.getPos(this.fld);
div.style.left = pos.x + "px"; div.style.left = pos.x + "px";
div.style.top = ( pos.y + this.fld.offsetHeight + this.oP.offsety ) + "px"; div.style.top = ( pos.y + this.fld.offsetHeight + this.oP.offsety ) + "px";
div.style.width = this.fld.offsetWidth + "px"; div.style.width = this.fld.offsetWidth + "px";
@@ -408,7 +426,7 @@ _b.AutoSuggest.prototype.createList = function(arr)
// currently no item is highlighted // currently no item is highlighted
// //
this.iHigh = 0; this.iHigh = 0;
// remove list after an interval // remove list after an interval
// //
var pointer = this; var pointer = this;
@@ -416,25 +434,25 @@ _b.AutoSuggest.prototype.createList = function(arr)
}; };
_b.AutoSuggest.prototype.changeHighlight = function(key) _b.AutoSuggest.prototype.changeHighlight = function(key)
{ {
var list = _b.DOM.gE("as_ul"); var list = _b.DOM.gE("as_ul");
if (!list) if (!list)
return false; return false;
var n; var n;
if (key == 40) if (key == 40)
n = this.iHigh + 1; n = this.iHigh + 1;
else if (key == 38) else if (key == 38)
n = this.iHigh - 1; n = this.iHigh - 1;
if (n > list.childNodes.length) if (n > list.childNodes.length)
n = list.childNodes.length; n = list.childNodes.length;
if (n < 1) if (n < 1)
n = 1; n = 1;
this.setHighlight(n); this.setHighlight(n);
}; };
@@ -443,12 +461,12 @@ _b.AutoSuggest.prototype.setHighlight = function(n)
var list = _b.DOM.gE("as_ul"); var list = _b.DOM.gE("as_ul");
if (!list) if (!list)
return false; return false;
if (this.iHigh > 0) if (this.iHigh > 0)
this.clearHighlight(); this.clearHighlight();
this.iHigh = Number(n); this.iHigh = Number(n);
list.childNodes[this.iHigh-1].className = "as_highlight"; list.childNodes[this.iHigh-1].className = "as_highlight";
@@ -460,7 +478,7 @@ _b.AutoSuggest.prototype.clearHighlight = function()
var list = _b.DOM.gE("as_ul"); var list = _b.DOM.gE("as_ul");
if (!list) if (!list)
return false; return false;
if (this.iHigh > 0) if (this.iHigh > 0)
{ {
list.childNodes[this.iHigh-1].className = ""; list.childNodes[this.iHigh-1].className = "";
@@ -475,21 +493,21 @@ _b.AutoSuggest.prototype.setHighlightedValue = function ()
{ {
/** /**
* @autor Erik Amaru Ortiz <erik@colosa.com> * @autor Erik Amaru Ortiz <erik@colosa.com>
* This fix when a item on suggestion list have html wntities sent by json like &amp; * This fix when a item on suggestion list have html wntities sent by json like &amp;
*/ */
if(this.aSug[ this.iHigh-1 ]) if(this.aSug[ this.iHigh-1 ])
this.sInp = this.fld.value = html_entity_decode(this.aSug[ this.iHigh-1 ].value);; this.sInp = this.fld.value = html_entity_decode(this.aSug[ this.iHigh-1 ].value);;
// //
// move cursor to end of input (safari) // move cursor to end of input (safari)
// //
this.fld.focus(); this.fld.focus();
if (this.fld.selectionStart) if (this.fld.selectionStart)
this.fld.setSelectionRange(this.sInp.length, this.sInp.length); this.fld.setSelectionRange(this.sInp.length, this.sInp.length);
this.clearSuggestions(); this.clearSuggestions();
// pass selected object to callback function, if exists // pass selected object to callback function, if exists
// //
if (typeof(this.oP.callback) == "function") if (typeof(this.oP.callback) == "function")
@@ -503,16 +521,16 @@ _b.AutoSuggest.prototype.setHighlightedValue2 = function ()
{ {
if(this.aSug[ this.iHigh-1 ]) if(this.aSug[ this.iHigh-1 ])
this.sInp = this.fld.value = html_entity_decode(this.aSug[ this.iHigh-1 ].value); this.sInp = this.fld.value = html_entity_decode(this.aSug[ this.iHigh-1 ].value);
// move cursor to end of input (safari) // move cursor to end of input (safari)
// //
/*this.fld.focus(); /*this.fld.focus();
if (this.fld.selectionStart) if (this.fld.selectionStart)
this.fld.setSelectionRange(this.sInp.length, this.sInp.length); this.fld.setSelectionRange(this.sInp.length, this.sInp.length);
*/ */
//this.clearSuggestions(); //this.clearSuggestions();
// pass selected object to callback function, if exists // pass selected object to callback function, if exists
// //
/*if (typeof(this.oP.callback) == "function") /*if (typeof(this.oP.callback) == "function")
@@ -534,9 +552,9 @@ _b.AutoSuggest.prototype.resetTimeout = function()
_b.AutoSuggest.prototype.clearSuggestions = function () _b.AutoSuggest.prototype.clearSuggestions = function ()
{ {
this.killTimeout(); this.killTimeout();
var ele = _b.DOM.gE(this.idAs); var ele = _b.DOM.gE(this.idAs);
var pointer = this; var pointer = this;
if (ele) if (ele)
@@ -559,15 +577,15 @@ _b.Ajax = function ()
_b.Ajax.prototype.makeRequest = function (url, meth, onComp, onErr) _b.Ajax.prototype.makeRequest = function (url, meth, onComp, onErr)
{ {
if (meth != "POST") if (meth != "POST")
meth = "GET"; meth = "GET";
this.onComplete = onComp; this.onComplete = onComp;
this.onError = onErr; this.onError = onErr;
var pointer = this; var pointer = this;
// branch for native XMLHttpRequest object // branch for native XMLHttpRequest object
if (window.XMLHttpRequest) if (window.XMLHttpRequest)
{ {
@@ -591,7 +609,7 @@ _b.Ajax.prototype.makeRequest = function (url, meth, onComp, onErr)
_b.Ajax.prototype.processReqChange = function() _b.Ajax.prototype.processReqChange = function()
{ {
// only if req shows "loaded" // only if req shows "loaded"
if (this.req.readyState == 4) { if (this.req.readyState == 4) {
// only if "OK" // only if "OK"
@@ -615,12 +633,12 @@ _b.DOM.cE = function ( type, attr, cont, html )
var ne = document.createElement( type ); var ne = document.createElement( type );
if (!ne) if (!ne)
return 0; return 0;
for (var a in attr) for (var a in attr)
ne[a] = attr[a]; ne[a] = attr[a];
var t = typeof(cont); var t = typeof(cont);
if (t == "string" && !html) if (t == "string" && !html)
ne.appendChild( document.createTextNode(cont) ); ne.appendChild( document.createTextNode(cont) );
else if (t == "string" && html) else if (t == "string" && html)
@@ -657,7 +675,7 @@ _b.DOM.gE = function ( e )
_b.DOM.remE = function ( ele ) _b.DOM.remE = function ( ele )
{ {
var e = this.gE(ele); var e = this.gE(ele);
if (!e) if (!e)
return 0; return 0;
else if (e.parentNode.removeChild(e)) else if (e.parentNode.removeChild(e))
@@ -684,9 +702,9 @@ _b.DOM.getPos = function ( e )
} }
else if (obj.x) else if (obj.x)
curleft += obj.x; curleft += obj.x;
var obj = e; var obj = e;
var curtop = 0; var curtop = 0;
if (obj.offsetParent) if (obj.offsetParent)
{ {
@@ -708,22 +726,22 @@ if (typeof(_b.Fader) == "undefined")
_b.Fader = {}; _b.Fader = {};
_b.Fader = function (ele, from, to, fadetime, callback) _b.Fader = function (ele, from, to, fadetime, callback)
{ {
if (!ele) if (!ele)
return 0; return 0;
this.e = ele; this.e = ele;
this.from = from; this.from = from;
this.to = to; this.to = to;
this.cb = callback; this.cb = callback;
this.nDur = fadetime; this.nDur = fadetime;
this.nInt = 50; this.nInt = 50;
this.nTime = 0; this.nTime = 0;
var p = this; var p = this;
this.nID = setInterval(function() { p._fade() }, this.nInt); this.nID = setInterval(function() { p._fade() }, this.nInt);
}; };
@@ -731,16 +749,16 @@ _b.Fader = function (ele, from, to, fadetime, callback)
_b.Fader.prototype._fade = function() _b.Fader.prototype._fade = function()
{ {
this.nTime += this.nInt; this.nTime += this.nInt;
var ieop = Math.round( this._tween(this.nTime, this.from, this.to, this.nDur) * 100 ); var ieop = Math.round( this._tween(this.nTime, this.from, this.to, this.nDur) * 100 );
var op = ieop / 100; var op = ieop / 100;
if (this.e.filters) // internet explorer if (this.e.filters) // internet explorer
{ {
try try
{ {
this.e.filters.item("DXImageTransform.Microsoft.Alpha").opacity = ieop; this.e.filters.item("DXImageTransform.Microsoft.Alpha").opacity = ieop;
} catch (e) { } catch (e) {
// If it is not set initially, the browser will throw an error. This will set it if it is not set yet. // If it is not set initially, the browser will throw an error. This will set it if it is not set yet.
this.e.style.filter = 'progid:DXImageTransform.Microsoft.Alpha(opacity='+ieop+')'; this.e.style.filter = 'progid:DXImageTransform.Microsoft.Alpha(opacity='+ieop+')';
} }
@@ -749,8 +767,8 @@ _b.Fader.prototype._fade = function()
{ {
this.e.style.opacity = op; this.e.style.opacity = op;
} }
if (this.nTime == this.nDur) if (this.nTime == this.nDur)
{ {
clearInterval( this.nID ); clearInterval( this.nID );
@@ -764,41 +782,97 @@ _b.Fader.prototype._tween = function(t,b,c,d)
return b + ( (c-b) * (t/d) ); return b + ( (c-b) * (t/d) );
}; };
function storeEntryMessageHide(id)
{
function storeEntry(o, cnn, table, pk, pkt, fld){ if (document.getElementById(id)) {
if( typeof('Static_AutosuggestResponseData') != 'undefined' && Static_AutosuggestResponseData.results.length == 0 ){ document.getElementById(id).parentNode.removeChild(document.getElementById(id));
//alert('store it '+ ' -> '+o.id+' val '+ o.value); }
var myAjax = new _b.Ajax();
myAjax.makeRequest('../gulliver/genericAjax?request=storeInTmp'+'&cnn='+cnn+'&table='+table+'&pk='+pk+'&pkt='+pkt+'&fld='+fld+'&value='+o.value, 'POST',
function(req){
var response = eval('('+req.responseText+')');
if( response.status != 0 ){
alert(response.message);
}
},
function(req){
//alert(req)
} );
}
} }
function html_entity_decode( string, quote_style ) { function storeEntryProcessAjax(o, cnn, table, pk, pkt, fld)
var histogram = {}, symbol = '', tmp_str = '', entity = ''; {
tmp_str = string.toString(); var myAjax = new _b.Ajax();
if (false === (histogram = get_html_translation_table('HTML_ENTITIES', quote_style))) { myAjax.makeRequest(
return false; "../gulliver/genericAjax?request=storeInTmp" + "&cnn=" + cnn + "&table=" + table + "&pk=" + pk + "&pkt=" + pkt + "&fld=" + fld + "&value=" + o.value,
} "POST",
function (req)
// &amp; must be the last character when decoding! {
delete(histogram['&']); var response = eval("(" + req.responseText + ")");
histogram['&'] = '&amp;';
switch (response.status) {
for (symbol in histogram) { case 1:
entity = histogram[symbol]; var w1 = document.documentElement.clientWidth;
tmp_str = tmp_str.split(entity).join(symbol); var sbX1 = document.documentElement.scrollLeft;
} var sbY1 = document.documentElement.scrollTop;
var w2 = document.body.clientWidth;
var sbX2 = document.body.scrollLeft;
var sbY2 = document.body.scrollTop;
var bodyW = (w1 > 0)? w1 : w2;
var scrollbarX = (sbX1 > 0)? sbX1 : sbX2;
var scrollbarY = (sbY1 > 0)? sbY1 : sbY2;
storeEntryMessageHide("myIframe");
var myIframe = document.createElement("iframe");
myIframe.setAttribute("id", "myIframe");
myIframe.style.position = "absolute";
myIframe.style.left = (parseInt(bodyW / 2) - 200 + scrollbarX) + "px";
myIframe.style.top = (scrollbarY + 5) + "px";
myIframe.src = "about:blank";
myIframe.frameBorder = 0;
myIframe.scrolling = "no";
myIframe.style.width = "400px";
myIframe.style.height = "45px";
leimnud.event.add(
myIframe,
"load",
function (evt)
{
document.getElementById("myIframe").contentWindow.document.body.style.margin = 0;
document.getElementById("myIframe").contentWindow.document.body.style.padding = 0;
document.getElementById("myIframe").contentWindow.document.body.innerHTML = "<div style=\"border: 1px solid #808080; width: 398px; height: 43px; background: #ADDCC7; font:0.9em arial, verdana, helvetica, sans-serif;\"><div style=\"margin: 0.5em 0 0 0.5em;\"><img src=\"/images/documents/_accept.png\" alt=\"\" style=\"margin-right: 0.8em; vertical-align: middle;\" />" + _("ID_FIELD_DYNAFORM_SUGGEST_MESSAGE_TEMPORAL") + "</div></div>";
}
);
document.body.appendChild(myIframe);
setTimeout("storeEntryMessageHide(\"myIframe\")", 1750);
swStoreEntry = 0;
break;
default:
alert(response.message);
break;
}
},
function (req)
{
//alert(req);
}
);
}
function html_entity_decode( string, quote_style ) {
var histogram = {}, symbol = '', tmp_str = '', entity = '';
tmp_str = string.toString();
if (false === (histogram = get_html_translation_table('HTML_ENTITIES', quote_style))) {
return false;
}
// &amp; must be the last character when decoding!
delete(histogram['&']);
histogram['&'] = '&amp;';
for (symbol in histogram) {
entity = histogram[symbol];
tmp_str = tmp_str.split(entity).join(symbol);
}
return tmp_str; return tmp_str;
} }

90
gulliver/methods/genericAjax.php
View File

@@ -1,4 +1,4 @@
<?php <?php
$request = isset($_POST['request'])? $_POST['request']: null; $request = isset($_POST['request'])? $_POST['request']: null;
if( !isset($request) ){ if( !isset($request) ){
@@ -9,18 +9,18 @@ if( isset($request) ){
case 'deleteGridRowOnDynaform': case 'deleteGridRowOnDynaform':
// This code is to update the SESSION variable for dependent fields in grids // This code is to update the SESSION variable for dependent fields in grids
$oFields = array(); $oFields = array();
if (!defined('XMLFORM_AJAX_PATH')) define('XMLFORM_AJAX_PATH',PATH_XMLFORM); if (!defined('XMLFORM_AJAX_PATH')) define('XMLFORM_AJAX_PATH',PATH_XMLFORM);
ksort($_SESSION[$_POST['formID']][$_POST['gridname']]); ksort($_SESSION[$_POST['formID']][$_POST['gridname']]);
$initialKey = 1; $initialKey = 1;
foreach ($_SESSION[$_POST['formID']][$_POST['gridname']] as $key => $value) { foreach ($_SESSION[$_POST['formID']][$_POST['gridname']] as $key => $value) {
if ($key != $_POST['rowpos']) { if ($key != $_POST['rowpos']) {
$oFields[$initialKey] = $value; $oFields[$initialKey] = $value;
$initialKey++; $initialKey++;
} }
} }
unset($_SESSION[$_POST['formID']][$_POST['gridname']]); unset($_SESSION[$_POST['formID']][$_POST['gridname']]);
$_SESSION[$_POST['formID']][$_POST['gridname']] = $oFields; $_SESSION[$_POST['formID']][$_POST['gridname']] = $oFields;
/* if( isset($_SESSION['APPLICATION']) ){ /* if( isset($_SESSION['APPLICATION']) ){
G::LoadClass('case'); G::LoadClass('case');
$oApp= new Cases(); $oApp= new Cases();
@@ -31,9 +31,9 @@ if( isset($request) ){
$oFields[$initialKey] = $value; $oFields[$initialKey] = $value;
$initialKey++; $initialKey++;
$aFields['APP_DATA'][$_POST['gridname']] = $oFields; $aFields['APP_DATA'][$_POST['gridname']] = $oFields;
} }
$oApp->updateCase($_SESSION['APPLICATION'], $aFields); $oApp->updateCase($_SESSION['APPLICATION'], $aFields);
} }
*/ */
break; break;
/** widgets **/ /** widgets **/
@@ -41,8 +41,8 @@ if( isset($request) ){
try { try {
if(isset($_GET["inputEnconde64"])) { if(isset($_GET["inputEnconde64"])) {
$_GET['input'] = base64_decode($_GET['input']); $_GET['input'] = base64_decode($_GET['input']);
} }
$sData = base64_decode(str_rot13($_GET['hash'])); $sData = base64_decode(str_rot13($_GET['hash']));
list($SQL, $DB_UID) = explode('@|', $sData); list($SQL, $DB_UID) = explode('@|', $sData);
// Remplace values for dependent fields // Remplace values for dependent fields
@@ -57,7 +57,7 @@ if( isset($request) ){
$parser = new PHPSQLParser($SQL); $parser = new PHPSQLParser($SQL);
// Verif parsed array // Verif parsed array
// print_r($parser->parsed); // print_r($parser->parsed);
$SQL = queryModified($parser->parsed, $_GET['input']); $SQL = queryModified($parser->parsed, $_GET['input']);
$aRows = Array(); $aRows = Array();
@@ -130,7 +130,7 @@ if( isset($request) ){
$arr = array(); $arr = array();
$aReplace = array("(\r\n)", "(\n\r)", "(\n)", "(\r)"); $aReplace = array("(\r\n)", "(\n\r)", "(\n)", "(\r)");
for ($i=0;$i<count($aResults);$i++) { for ($i=0;$i<count($aResults);$i++) {
$arr[] = "{\"id\": \"".$aResults[$i]['id']."\", \"value\": \"". html_entity_decode(preg_replace($aReplace, "", $aResults[$i]['value']))."\", \"info\": \"".$aResults[$i]['info']."\"}"; $arr[] = "{\"id\": \"".$aResults[$i]['id']."\", \"value\": \"". html_entity_decode(preg_replace($aReplace, "", $aResults[$i]['value']))."\", \"info\": \"".$aResults[$i]['info']."\"}";
} }
echo implode(", ", $arr); echo implode(", ", $arr);
echo "]}"; echo "]}";
@@ -168,12 +168,14 @@ if( isset($request) ){
} }
$rs = $con->executeQuery("INSERT INTO {$_GET['table']} ({$_GET['pk']}, {$_GET['fld']}) VALUES ('$gKey', '{$_GET['value']}');"); $rs = $con->executeQuery("INSERT INTO {$_GET['table']} ({$_GET['pk']}, {$_GET['fld']}) VALUES ('$gKey', '{$_GET['value']}');");
echo '{status:0, message:"success"}';
}catch( Exception $e){ echo "{status: 1, message: \"success\"}";
} catch (Exception $e) {
$err = $e->getMessage(); $err = $e->getMessage();
//$err = eregi_replace("[\n|\r|\n\r]", ' ', $err); //$err = eregi_replace("[\n|\r|\n\r]", ' ', $err);
$err = preg_replace("[\n|\r|\n\r]", ' ', $err); // Made compatible to PHP 5.3 $err = preg_replace("[\n|\r|\n\r]", " ", $err); //Made compatible to PHP 5.3
echo '{result:1, message:"'.$err.'"}';
echo "{status: 0, message: \"" . $err . "\"}";
} }
break; break;
} }
@@ -213,31 +215,31 @@ function sortByChar($aRows, $charSel)
* Converts a SQL array parsing to a SQL string. * Converts a SQL array parsing to a SQL string.
* @param string $sqlParsed * @param string $sqlParsed
* @param string $inputSel default value empty string * @param string $inputSel default value empty string
* @return string * @return string
*/ */
function queryModified($sqlParsed, $inputSel = "") function queryModified($sqlParsed, $inputSel = "")
{ {
if(!empty($sqlParsed['SELECT'])) { if(!empty($sqlParsed['SELECT'])) {
$sqlSelect = "SELECT "; $sqlSelect = "SELECT ";
$aSelect = $sqlParsed['SELECT']; $aSelect = $sqlParsed['SELECT'];
$sFieldSel = (count($aSelect)>1 ) ? $aSelect[1]['base_expr'] : $aSelect[0]['base_expr']; $sFieldSel = (count($aSelect)>1 ) ? $aSelect[1]['base_expr'] : $aSelect[0]['base_expr'];
foreach($aSelect as $key => $value ) { foreach($aSelect as $key => $value ) {
if($key != 0) if($key != 0)
$sqlSelect .= ", "; $sqlSelect .= ", ";
$sAlias = str_replace("`","", $aSelect[$key]['alias']); $sAlias = str_replace("`","", $aSelect[$key]['alias']);
$sBaseExpr = $aSelect[$key]['base_expr']; $sBaseExpr = $aSelect[$key]['base_expr'];
switch($aSelect[$key]['expr_type']){ switch($aSelect[$key]['expr_type']){
case 'colref' : if($sAlias === $sBaseExpr) case 'colref' : if($sAlias === $sBaseExpr)
$sqlSelect .= $sAlias; $sqlSelect .= $sAlias;
else else
$sqlSelect .= $sBaseExpr . ' AS ' . $sAlias; $sqlSelect .= $sBaseExpr . ' AS ' . $sAlias;
break; break;
case 'expression' : if($sAlias === $sBaseExpr) case 'expression' : if($sAlias === $sBaseExpr)
$sqlSelect .= $sBaseExpr; $sqlSelect .= $sBaseExpr;
else else
$sqlSelect .= $sBaseExpr . ' AS ' . $sAlias; $sqlSelect .= $sBaseExpr . ' AS ' . $sAlias;
break; break;
case 'subquery' : if(strpos($sAlias, $sBaseExpr,0) != 0) case 'subquery' : if(strpos($sAlias, $sBaseExpr,0) != 0)
@@ -245,9 +247,9 @@ function queryModified($sqlParsed, $inputSel = "")
else else
$sqlSelect .= $sBaseExpr . " AS " . $sAlias; $sqlSelect .= $sBaseExpr . " AS " . $sAlias;
break; break;
case 'operator' : $sqlSelect .= $sBaseExpr; case 'operator' : $sqlSelect .= $sBaseExpr;
break; break;
default : $sqlSelect .= $sBaseExpr; default : $sqlSelect .= $sBaseExpr;
break; break;
} }
} }
@@ -260,7 +262,7 @@ function queryModified($sqlParsed, $inputSel = "")
if($key == 0) { if($key == 0) {
$sqlFrom .= $aFrom[$key]['table'] . (($aFrom[$key]['table'] == $aFrom[$key]['alias'])?"" : " " . $aFrom[$key]['alias']); $sqlFrom .= $aFrom[$key]['table'] . (($aFrom[$key]['table'] == $aFrom[$key]['alias'])?"" : " " . $aFrom[$key]['alias']);
} else { } else {
$sqlFrom .= " " . (($aFrom[$key]['join_type']=='JOIN')?"INNER": $aFrom[$key]['join_type']) . " JOIN " . $aFrom[$key]['table'] $sqlFrom .= " " . (($aFrom[$key]['join_type']=='JOIN')?"INNER": $aFrom[$key]['join_type']) . " JOIN " . $aFrom[$key]['table']
. (($aFrom[$key]['table'] == $aFrom[$key]['alias'])?"" : " " . $aFrom[$key]['alias']) . " " . $aFrom[$key]['ref_type'] . " " . $aFrom[$key]['ref_clause'] ; . (($aFrom[$key]['table'] == $aFrom[$key]['alias'])?"" : " " . $aFrom[$key]['alias']) . " " . $aFrom[$key]['ref_type'] . " " . $aFrom[$key]['ref_clause'] ;
} }
@@ -271,48 +273,48 @@ function queryModified($sqlParsed, $inputSel = "")
if(!empty($sqlParsed['WHERE'])){ if(!empty($sqlParsed['WHERE'])){
$sqlWhere = " WHERE "; $sqlWhere = " WHERE ";
$aWhere = $sqlParsed['WHERE']; $aWhere = $sqlParsed['WHERE'];
foreach($aWhere as $key => $value ){ foreach($aWhere as $key => $value ){
$sqlWhere .= $value['base_expr'] . " "; $sqlWhere .= $value['base_expr'] . " ";
} }
$sqlWhere .= " AND " . $sFieldSel . " LIKE '%". $inputSel . "%'"; $sqlWhere .= " AND " . $sFieldSel . " LIKE '%". $inputSel . "%'";
} }
else { else {
$sqlWhere = " WHERE " . $sFieldSel . " LIKE '%". $inputSel ."%' "; $sqlWhere = " WHERE " . $sFieldSel . " LIKE '%". $inputSel ."%' ";
} }
$sqlGroupBy = ""; $sqlGroupBy = "";
if(!empty($sqlParsed['GROUP'])){ if(!empty($sqlParsed['GROUP'])){
$sqlGroupBy = "GROUP BY "; $sqlGroupBy = "GROUP BY ";
$aGroup = $sqlParsed['GROUP']; $aGroup = $sqlParsed['GROUP'];
foreach($aGroup as $key => $value ){ foreach($aGroup as $key => $value ){
if($key != 0) if($key != 0)
$sqlGroupBy .= ", "; $sqlGroupBy .= ", ";
if($value['direction'] == 'ASC' ) if($value['direction'] == 'ASC' )
$sqlGroupBy .= $value['base_expr']; $sqlGroupBy .= $value['base_expr'];
else else
$sqlGroupBy .= $value['base_expr'] . " " . $value['direction']; $sqlGroupBy .= $value['base_expr'] . " " . $value['direction'];
} }
} }
$sqlHaving = ""; $sqlHaving = "";
if(!empty($sqlParsed['HAVING'])){ if(!empty($sqlParsed['HAVING'])){
$sqlHaving = "HAVING "; $sqlHaving = "HAVING ";
$aHaving = $sqlParsed['HAVING']; $aHaving = $sqlParsed['HAVING'];
foreach($aHaving as $key => $value ){ foreach($aHaving as $key => $value ){
$sqlHaving .= $value['base_expr'] . " "; $sqlHaving .= $value['base_expr'] . " ";
} }
} }
$sqlOrderBy = ""; $sqlOrderBy = "";
if(!empty($sqlParsed['ORDER'])){ if(!empty($sqlParsed['ORDER'])){
$sqlOrderBy = "ORDER BY "; $sqlOrderBy = "ORDER BY ";
$aOrder = $sqlParsed['ORDER']; $aOrder = $sqlParsed['ORDER'];
foreach($aOrder as $key => $value ){ foreach($aOrder as $key => $value ){
if($key != 0) if($key != 0)
$sqlOrderBy .= ", "; $sqlOrderBy .= ", ";
if($value['direction'] == 'ASC' ) if($value['direction'] == 'ASC' )
$sqlOrderBy .= $value['base_expr']; $sqlOrderBy .= $value['base_expr'];
else else
$sqlOrderBy .= $value['base_expr'] . " " . $value['direction']; $sqlOrderBy .= $value['base_expr'] . " " . $value['direction'];
} }
} else { } else {
@@ -320,7 +322,7 @@ function queryModified($sqlParsed, $inputSel = "")
} }
$sqlLimit = ""; $sqlLimit = "";
if(!empty($sqlParsed['LIMIT'])){ if(!empty($sqlParsed['LIMIT'])){
$sqlLimit = "LIMIT ". $sqlParsed['LIMIT']['start'] . ", " . $sqlParsed['LIMIT']['end']; $sqlLimit = "LIMIT ". $sqlParsed['LIMIT']['start'] . ", " . $sqlParsed['LIMIT']['end'];
} }
@@ -329,15 +331,15 @@ function queryModified($sqlParsed, $inputSel = "")
if(!empty($sqlParsed['CALL'])){ if(!empty($sqlParsed['CALL'])){
$sCall = "CALL "; $sCall = "CALL ";
$aCall = $sqlParsed['CALL']; $aCall = $sqlParsed['CALL'];
foreach($aCall as $key => $value ){ foreach($aCall as $key => $value ){
$sCall .= $value . " "; $sCall .= $value . " ";
} }
return $sCall; return $sCall;
} }
if(!empty($sqlParsed['EXECUTE'])){ if(!empty($sqlParsed['EXECUTE'])){
$sCall = "EXECUTE "; $sCall = "EXECUTE ";
$aCall = $sqlParsed['EXECUTE']; $aCall = $sqlParsed['EXECUTE'];
foreach($aCall as $key => $value ){ foreach($aCall as $key => $value ){
$sCall .= $value . " "; $sCall .= $value . " ";
} }
return $sCall; return $sCall;
@@ -345,7 +347,7 @@ function queryModified($sqlParsed, $inputSel = "")
if(!empty($sqlParsed[''])){ if(!empty($sqlParsed[''])){
$sCall = ""; $sCall = "";
$aCall = $sqlParsed['']; $aCall = $sqlParsed[''];
foreach($aCall as $key => $value ){ foreach($aCall as $key => $value ){
$sCall .= $value . " "; $sCall .= $value . " ";
} }
return $sCall; return $sCall;

22
gulliver/system/class.xmlform.php
View File

@@ -1167,9 +1167,12 @@ class XmlForm_Field_Suggest extends XmlForm_Field_SimpleText //by neyek
'size' => '"'.$this->size.'"', 'size' => '"'.$this->size.'"',
); );
$storeEntry = ''; $storeEntry = null;
if($this->store_new_entry){ $storeEntryData = ", storeEntryData: [0]";
$storeEntry = 'onchange="storeEntry(this, \''.$this->sqlConnection.'\', \''.$this->table.'\', \''.$this->primary_key.'\', \''.$this->primary_key_type.'\', \''.$this->field.'\')"';
if ($this->store_new_entry) {
$storeEntry = ' title="' . G::LoadTranslation("ID_FIELD_DYNAFORM_SUGGEST_INPUT_TITLE") . '"';
$storeEntryData = ", storeEntryData: [1, \"form[". $this->name . "_label]\", \"" . $this->sqlConnection . "\", \"" . $this->table . "\", \"" . $this->primary_key . "\", \"" . $this->primary_key_type . "\", \"" . $this->field . "\"]";
} }
$formVariableValue = ''; $formVariableValue = '';
@@ -1269,10 +1272,11 @@ class XmlForm_Field_Suggest extends XmlForm_Field_SimpleText //by neyek
$setValue = ($this->savelabel == '1') ? 'obj.value' : 'obj.id'; $setValue = ($this->savelabel == '1') ? 'obj.value' : 'obj.id';
$sOptions .= 'callback: function(obj){'; $sOptions .= 'callback: function (obj) { ';
$sOptions .= 'if (typeof obj != "undefined") { ';
$sOptions .= ' var jField = { };'; $sOptions .= ' var jField = { };';
$sOptions .= ' var sField = "[]"; '; $sOptions .= ' var sField = "[]"; ';
if ($count > 0) { if ($count > 0) {
for ($cnt = 0; $cnt < $count; $cnt++ ) { for ($cnt = 0; $cnt < $count; $cnt++ ) {
$sOptions .= 'if ( "' . $this->name . '" == "' . $aDepFields[$cnt] . '" ) {'; $sOptions .= 'if ( "' . $this->name . '" == "' . $aDepFields[$cnt] . '" ) {';
@@ -1286,7 +1290,6 @@ class XmlForm_Field_Suggest extends XmlForm_Field_SimpleText //by neyek
$sOptions .= ' var sField = "["+ encodeURIComponent(jField.toJSONString()) + "]"; '; $sOptions .= ' var sField = "["+ encodeURIComponent(jField.toJSONString()) + "]"; ';
$sOptions .= $sCallBack . '; getField("' . $this->name . '").value = obj.id;'; $sOptions .= $sCallBack . '; getField("' . $this->name . '").value = obj.id;';
$sOptions .= 'var response = ajax_function("../gulliver/defaultAjaxDynaform", "reloadField", '; $sOptions .= 'var response = ajax_function("../gulliver/defaultAjaxDynaform", "reloadField", ';
$sOptions .= ' "form=' . $owner->id . '&fields=" + sField, "POST"); '; $sOptions .= ' "form=' . $owner->id . '&fields=" + sField, "POST"); ';
@@ -1316,11 +1319,12 @@ class XmlForm_Field_Suggest extends XmlForm_Field_SimpleText //by neyek
$sOptions .= '} else { '; $sOptions .= '} else { ';
$sOptions .= ' alert(\'Invalid response: \' + response); ' ; $sOptions .= ' alert(\'Invalid response: \' + response); ' ;
$sOptions .= '} '; $sOptions .= '} ';
$sOptions .= '} ';
$sOptions .= 'return false; }'; $sOptions .= 'return false; ';
$sOptions .= '}';
$str .= '<script type="text/javascript">'; $str .= '<script type="text/javascript">';
$str .= 'var as_json = new bsn.AutoSuggest(\'form[' . $this->name . '_label]\', {'.$sOptions.'});'; $str .= 'var as_json = new bsn.AutoSuggest(\'form[' . $this->name . '_label]\', {' . $sOptions . $storeEntryData . '});';
$str .= '</script>'; $str .= '</script>';
return $str; return $str;

51
workflow/engine/js/dbConnections/main.js
View File

@@ -1,14 +1,13 @@
/* /*
* Data base connection javascript routines * Data base connection javascript routines
* @Author Erik Amatu Ortiz <erik@colosa.com> * @Author Erik Amatu Ortiz <erik@colosa.com>
* @Update date May 20th, 2009 * @Update date May 20th, 2009
*/ */
var PROCESS_REQUEST_FILE = '../dbConnections/dbConnectionsAjax'; var PROCESS_REQUEST_FILE = '../dbConnections/dbConnectionsAjax';
String.prototype.trim = function() String.prototype.trim = function () {
{ return this.replace(/^\s+|\s+$/g, "");
return this.replace(/^\s+|\s+get/g,"");
} }
var oPanel; var oPanel;
@@ -86,7 +85,7 @@ function saveEditDBConnection()
if( getField('DBS_PORT').value.trim() == '' || getField('DBS_PORT').value.trim() == '0' ) { if( getField('DBS_PORT').value.trim() == '' || getField('DBS_PORT').value.trim() == '0' ) {
onChangeType(); onChangeType();
} }
var dbs_uid = currentEditDBS_UID; var dbs_uid = currentEditDBS_UID;
var type = $('form[DBS_TYPE]').value; var type = $('form[DBS_TYPE]').value;
var server = $('form[DBS_SERVER]').value; var server = $('form[DBS_SERVER]').value;
@@ -375,16 +374,16 @@ function validateFields()
if( getField('DBS_PORT').value.trim() == '' || getField('DBS_PORT').value.trim() == '0' ) { if( getField('DBS_PORT').value.trim() == '' || getField('DBS_PORT').value.trim() == '0' ) {
onChangeType(); onChangeType();
} }
var res = true; var res = true;
var o = new input(getField('DBS_SERVER')); var o = new input(getField('DBS_SERVER'));
if($('form[DBS_SERVER]').value == '') { if($('form[DBS_SERVER]').value == '') {
//new leimnud.module.app.alert().make({label: G_STRINGS.DBCONNECTIONS_MSG4}); //new leimnud.module.app.alert().make({label: G_STRINGS.DBCONNECTIONS_MSG4});
o.failed(); o.failed();
res = false; res = false;
} else } else
o.passed(); o.passed();
var o = new input(getField('DBS_DATABASE_NAME')); var o = new input(getField('DBS_DATABASE_NAME'));
if($('form[DBS_DATABASE_NAME]').value == '') { if($('form[DBS_DATABASE_NAME]').value == '') {
//new leimnud.module.app.alert().make({label: G_STRINGS.DBCONNECTIONS_MSG5}); //new leimnud.module.app.alert().make({label: G_STRINGS.DBCONNECTIONS_MSG5});
@@ -392,7 +391,7 @@ function validateFields()
res = false; res = false;
} else } else
o.passed(); o.passed();
var o = new input(getField('DBS_USERNAME')); var o = new input(getField('DBS_USERNAME'));
if($('form[DBS_USERNAME]').value == '') { if($('form[DBS_USERNAME]').value == '') {
//new leimnud.module.app.alert().make({label: G_STRINGS.DBCONNECTIONS_MSG6}); //new leimnud.module.app.alert().make({label: G_STRINGS.DBCONNECTIONS_MSG6});
@@ -400,22 +399,22 @@ function validateFields()
res = false; res = false;
} else } else
o.passed(); o.passed();
/*var o = new input(getField('DBS_PORT')); /*var o = new input(getField('DBS_PORT'));
if($('form[DBS_PORT]').value == '') { if($('form[DBS_PORT]').value == '') {
o.failed(); o.failed();
res = false; res = false;
} else } else
o.passed();*/ o.passed();*/
var o = new input(getField('DBS_TYPE')); var o = new input(getField('DBS_TYPE'));
if($('form[DBS_TYPE]').value == '0') { if($('form[DBS_TYPE]').value == '0') {
o.failed(); o.failed();
res = false; res = false;
} else } else
o.passed(); o.passed();
oType = getField('DBS_TYPE'); oType = getField('DBS_TYPE');
if( oType.value != 'mssql' && oType.value != 'oracle' ){ if( oType.value != 'mssql' && oType.value != 'oracle' ){
var o = new input(getField('DBS_ENCODE')); var o = new input(getField('DBS_ENCODE'));
if($('form[DBS_ENCODE]').value == '0') { if($('form[DBS_ENCODE]').value == '0') {
@@ -425,7 +424,7 @@ function validateFields()
o.passed(); o.passed();
} }
if(!res){ if(!res){
new leimnud.module.app.alert().make({label: G_STRINGS.DBCONNECTIONS_ALERT}); new leimnud.module.app.alert().make({label: G_STRINGS.DBCONNECTIONS_ALERT});
} }
@@ -434,7 +433,7 @@ function validateFields()
var onChangeType = function() { var onChangeType = function() {
var oAux = getField('DBS_PORT'); var oAux = getField('DBS_PORT');
switch(getField('DBS_TYPE').value) { switch(getField('DBS_TYPE').value) {
case 'mysql': case 'mysql':
oAux.value = '3306'; oAux.value = '3306';
@@ -451,11 +450,11 @@ var onChangeType = function() {
default: default:
oAux.value = ''; oAux.value = '';
} }
}; };
function showEncodes(pre){ function showEncodes(pre){
oType = getField('DBS_TYPE'); oType = getField('DBS_TYPE');
//if( oType.value != 'mssql' && oType.value != 'oracle' ){ //if( oType.value != 'mssql' && oType.value != 'oracle' ){
if( oType.value != 'oracle' ){ if( oType.value != 'oracle' ){
showRowById('DBS_ENCODE'); showRowById('DBS_ENCODE');
@@ -465,29 +464,29 @@ function showEncodes(pre){
res = false; res = false;
} else } else
o.passed(); o.passed();
var o = getField('DBS_TYPE'); var o = getField('DBS_TYPE');
var oRPC = new leimnud.module.rpc.xmlhttp({ var oRPC = new leimnud.module.rpc.xmlhttp({
url : PROCESS_REQUEST_FILE, url : PROCESS_REQUEST_FILE,
args: 'action=showEncodes&engine='+o.value args: 'action=showEncodes&engine='+o.value
}); });
oRPC.callback = function(rpc){ oRPC.callback = function(rpc){
var oEnc = getField('DBS_ENCODE'); var oEnc = getField('DBS_ENCODE');
response = eval('{'+oRPC.xmlhttp.responseText+'}'); response = eval('{'+oRPC.xmlhttp.responseText+'}');
oEnc.options.length = 0; oEnc.options.length = 0;
//set news //set news
for(i=0; i<response.length; i++){ for(i=0; i<response.length; i++){
var newOption = new Option(response[i][1], response[i][0]); var newOption = new Option(response[i][1], response[i][0]);
oEnc.options[i] = newOption; oEnc.options[i] = newOption;
} }
if(pre != null) if(pre != null)
oEnc.value = pre; oEnc.value = pre;
var o = new input(getField('DBS_ENCODE')); var o = new input(getField('DBS_ENCODE'));
if($('form[DBS_ENCODE]').value == '0') { if($('form[DBS_ENCODE]').value == '0') {
o.failed(); o.failed();
@@ -500,5 +499,3 @@ function showEncodes(pre){
hideRowById('DBS_ENCODE'); hideRowById('DBS_ENCODE');
} }
} }

25
workflow/engine/js/setup/emails.js
View File

@@ -5,7 +5,7 @@
var PROCESS_REQUEST_FILE = '../setup/emails_Ajax'; var PROCESS_REQUEST_FILE = '../setup/emails_Ajax';
var oPanel; var oPanel;
function verifyFields(oForm) { function verifyFields(oForm) {
switch (getField('MESS_ENGINE').value) { switch (getField('MESS_ENGINE').value) {
case 'PHPMAILER': case 'PHPMAILER':
verifyPassword = 0; verifyPassword = 0;
@@ -25,7 +25,7 @@ function verifyFields(oForm) {
} else { } else {
if ($('form[MESS_RAUTH]').checked) { if ($('form[MESS_RAUTH]').checked) {
oAuxP = $('form[MESS_PASSWORD]').value; oAuxP = $('form[MESS_PASSWORD]').value;
oAuxPH = $('form[MESS_PASSWORD_HIDDEN]').value; oAuxPH = $('form[MESS_PASSWORD_HIDDEN]').value;
if ((oAuxP == '')&&(oAuxPH == '')) { if ((oAuxP == '')&&(oAuxPH == '')) {
new leimnud.module.app.alert().make({ new leimnud.module.app.alert().make({
label : G_STRINGS.ID_PASSWORD_REQUIRED label : G_STRINGS.ID_PASSWORD_REQUIRED
@@ -82,18 +82,18 @@ function testConnection() {
params += '&passwd=' + getField('MESS_PASSWORD').value; params += '&passwd=' + getField('MESS_PASSWORD').value;
} }
else { else {
params += '&passwd=' + getField('MESS_PASSWORD_HIDDEN').value; params += '&passwd=' + getField('MESS_PASSWORD_HIDDEN').value;
} }
params += '&auth_required='+ (getField('MESS_RAUTH').checked ? 'yes' : 'no'); params += '&auth_required='+ (getField('MESS_RAUTH').checked ? 'yes' : 'no');
params += '&send_test_mail='+ (getField('MESS_TEST_MAIL').checked ? 'yes' : 'no'); params += '&send_test_mail='+ (getField('MESS_TEST_MAIL').checked ? 'yes' : 'no');
params += '&mail_to=' + $('form[MESS_TEST_MAIL_TO]').value; params += '&mail_to=' + $('form[MESS_TEST_MAIL_TO]').value;
if(getField('SMTPSecure][ssl').checked) { if(getField('SMTPSecure][ssl').checked) {
params +='&SMTPSecure=ssl'; params +='&SMTPSecure=ssl';
} else if(getField('SMTPSecure][tls').checked) { } else if(getField('SMTPSecure][tls').checked) {
params +='&SMTPSecure=tls'; params +='&SMTPSecure=tls';
} else { } else {
params +='&SMTPSecure='; params +='&SMTPSecure=';
} }
oPanel = new leimnud.module.panel(); oPanel = new leimnud.module.panel();
@@ -111,10 +111,10 @@ function testConnection() {
delete (oPanel); delete (oPanel);
}.extend(this) }.extend(this)
}; };
oPanel.make(); oPanel.make();
oPanel.loader.show(); oPanel.loader.show();
var oRPC = new leimnud.module.rpc.xmlhttp({ var oRPC = new leimnud.module.rpc.xmlhttp({
url : PROCESS_REQUEST_FILE, url : PROCESS_REQUEST_FILE,
args : 'request=init&' + params args : 'request=init&' + params
@@ -168,7 +168,7 @@ function testConnectionMail() {
var resultset = true; var resultset = true;
function testSMTPHost(step, params) { function testSMTPHost(step, params) {
$("test_" + step).style.display = "block"; $("test_" + step).style.display = "block";
var requestfile = PROCESS_REQUEST_FILE; var requestfile = PROCESS_REQUEST_FILE;
var uri = 'request=testConnection&step=' + step +'&'+ params; var uri = 'request=testConnection&step=' + step +'&'+ params;
@@ -222,9 +222,10 @@ function cancelTestConnection() {
} }
// /************* Adds routines *************/// // /************* Adds routines *************///
String.prototype.trim = function() { String.prototype.trim = function () {
return this.replace(/^\s+|\s+get/g, ""); return this.replace(/^\s+|\s+$/g, "");
} }
function $(id) { function $(id) {
return document.getElementById(id); return document.getElementById(id);
} }
@@ -277,12 +278,12 @@ function initSet() {
} }
var verifyData = function(oForm) { var verifyData = function(oForm) {
if (getField('MESS_ENABLED').checked) { if (getField('MESS_ENABLED').checked) {
if (getField('MESS_RAUTH').checked) { if (getField('MESS_RAUTH').checked) {
if (getField('MESS_PASSWORD') == '') { if (getField('MESS_PASSWORD') == '') {
getField('MESS_PASSWORD').value = getField('MESS_PASSWORD_HIDDEN').value; getField('MESS_PASSWORD').value = getField('MESS_PASSWORD_HIDDEN').value;
} }
} }
switch (getField('MESS_ENGINE').value) { switch (getField('MESS_ENGINE').value) {
case 'PHPMAILER': case 'PHPMAILER':

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") 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> ]]><en>Dependent Fields<option name="">(none)</option></en>
</PME_DEPENDENTFIELDS> </PME_DEPENDENTFIELDS>
<PME_HINT type="textarea" cols="44" rows="1"> <PME_HINT type="textarea" cols="44" rows="1">
<en>Hint</en> <en>Hint</en>
</PME_HINT> </PME_HINT>
@@ -140,39 +140,44 @@ select XMLNODE_NAME, XMLNODE_NAME AS NAME FROM dynaForm WHERE XMLNODE_NAME <> @@
<en>Save</en> <en>Save</en>
</PME_ACCEPT> </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"; fieldName.focus();
var fieldName=getField("PME_XMLNODE_NAME",fieldForm); fieldName.select();
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";
leimnud.event.add(fieldName, "change", {method: dynaformVerifyFieldName, instance: fieldName, event: true});
storeNewEntriesOptions(getField('PME_STORE_NEW_ENTRY')); var dyntype = "@#PME_DYN_TYPE";
leimnud.event.add(getField('PME_STORE_NEW_ENTRY'), 'click', function(){
storeNewEntriesOptions(this);
});
storeNewEntriesOptions(getField("PME_STORE_NEW_ENTRY"));
function storeNewEntriesOptions(o){ leimnud.event.add(
if(o.checked){ getField("PME_STORE_NEW_ENTRY"),
showRowById('PME_PRIMARY_KEY'); "click",
getTablesNames(); function ()
getTableFields() {
getField('PME_TABLE').value = getField('PME_TABLE_DATA').value.trim(); storeNewEntriesOptions(getField("PME_STORE_NEW_ENTRY"));
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'); 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(){ leimnud.event.add(getField('PME_XMLNODE_VALUE'), 'keyup', function(){
getTablesNames(); 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(); getField('PME_PRIMARY_KEY_TYPE_DATA').value = this.value.trim();
}); });
function getTablesNames(){ function getTablesNames() {
var s0 = getField('PME_XMLNODE_VALUE').value; var strSql = getField("PME_XMLNODE_VALUE").value;
var s = getField('PME_XMLNODE_VALUE').value.toUpperCase();
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 "); p1 = s.indexOf(" FROM ");
if(p1 > 0){ 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 = s0.substring(p1, p2);
ss = ss.replace("FROM", "").trim(); ss = ss.replace("FROM", "").trim();
ss = ss.replace("from", "").trim(); ss = ss.replace("from", "").trim();
aTables = ss.split(','); aTables = ss.split(',');
otable = getField('PME_TABLE'); 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"); var newOption = new Option("", "0");
otable.options[0] = newOption; otable.options[0] = newOption;
for(i=0; i<aTables.length; i++){ var t = "";
var newOption = new Option(aTables[i], aTables[i]);
otable.options[i+1] = newOption; 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(){ function getTableFields() {
var s0 = getField('PME_XMLNODE_VALUE').value; var strSql = getField("PME_XMLNODE_VALUE").value;
var s = getField('PME_XMLNODE_VALUE').value.toUpperCase();
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 "); p1 = s.indexOf("SELECT ");
if(p1 >= 0){ if(p1 >= 0){
@@ -258,9 +279,13 @@ select XMLNODE_NAME, XMLNODE_NAME AS NAME FROM dynaForm WHERE XMLNODE_NAME <> @@
var newOption = new Option("", "0"); var newOption = new Option("", "0");
otable.options[0] = newOption; otable.options[0] = newOption;
for(i=0; i<aTables.length; i++){ var t = "";
var newOption = new Option(aTables[i], aTables[i]);
otable.options[i+1] = newOption; 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> ]]></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}); new leimnud.module.app.alert().make({label: G_STRINGS.ID_ROLES_MSG3});
return false; return false;
} }
var uri = 'request=verifyNewRole&code='+code; var uri = 'request=verifyNewRole&code='+code;
var ajax = AJAX(); var ajax = AJAX();
ajax.open("POST", PROCESS_REQUEST_FILE, true); ajax.open("POST", PROCESS_REQUEST_FILE, true);
ajax.setRequestHeader("Content-Type", "application/x-www-form-urlencoded;"); ajax.setRequestHeader("Content-Type", "application/x-www-form-urlencoded;");
ajax.onreadystatechange = function() { ajax.onreadystatechange = function() {
if(ajax.readyState == 4) { if(ajax.readyState == 4) {
if(eval(ajax.responseText.trim())){ if(eval(ajax.responseText.trim())){
try{ try{
parent = $('form[ROL_PARENT]').value; parent = $('form[ROL_PARENT]').value;
}catch(e){} }catch(e){}
code = $('form[ROL_CODE]').value; code = $('form[ROL_CODE]').value;
status = $('form[ROL_STATUS]').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({ var oRPC = new leimnud.module.rpc.xmlhttp({
url : PROCESS_REQUEST_FILE, url : PROCESS_REQUEST_FILE,
args: uri args: uri
}); });
oRPC.callback = function(rpc){ oRPC.callback = function(rpc){
var oRPC = new leimnud.module.rpc.xmlhttp({ var oRPC = new leimnud.module.rpc.xmlhttp({
url : PROCESS_REQUEST_FILE, url : PROCESS_REQUEST_FILE,
@@ -62,38 +62,38 @@ function saveNewRole()
args : 'request=show&r='+Math.random() args : 'request=show&r='+Math.random()
}); });
oRPC.make(); oRPC.make();
$('publisherContent[0]').innerHTML = oRPC.xmlhttp.responseText; $('publisherContent[0]').innerHTML = oRPC.xmlhttp.responseText;
window.location = 'roles_List'; window.location = 'roles_List';
}.extend(this); }.extend(this);
oRPC.make(); oRPC.make();
currentPopupWindow.remove(); currentPopupWindow.remove();
} }
if(!eval(ajax.responseText.trim())){ if(!eval(ajax.responseText.trim())){
new leimnud.module.app.alert().make({label: G_STRINGS.ID_ROLES_MSG2}); new leimnud.module.app.alert().make({label: G_STRINGS.ID_ROLES_MSG2});
return false; return false;
} }
} }
} }
ajax.send(uri); ajax.send(uri);
} }
function editRole(ROL_UID) function editRole(ROL_UID)
{ {
if(ROL_UID!='00000000000000000000000000000002') 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); popupWindow('', '../roles/roles_Ajax?'+uri, 350, 265);
} }
else 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) { function updateRole(ROL_UID) {
code = $('form[ROL_CODE]').value; code = $('form[ROL_CODE]').value;
name = $('form[ROL_NAME]').value; name = $('form[ROL_NAME]').value;
if(code == '') { if(code == '') {
@@ -111,16 +111,16 @@ function updateRole(ROL_UID) {
try{ try{
parent = $('form[ROL_PARENT]').value; parent = $('form[ROL_PARENT]').value;
}catch(e){} }catch(e){}
status = $('form[ROL_STATUS]').value; 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({ var oRPC = new leimnud.module.rpc.xmlhttp({
url : PROCESS_REQUEST_FILE, url : PROCESS_REQUEST_FILE,
args: uri args: uri
}); });
oRPC.callback = function(rpc){ oRPC.callback = function(rpc){
var oRPC = new leimnud.module.rpc.xmlhttp({ var oRPC = new leimnud.module.rpc.xmlhttp({
url : PROCESS_REQUEST_FILE, url : PROCESS_REQUEST_FILE,
@@ -140,21 +140,21 @@ function deleteRole(ROL_UID) {
var uri = 'request=canDeleteRole&ROL_UID='+ROL_UID; var uri = 'request=canDeleteRole&ROL_UID='+ROL_UID;
var ajax = AJAX(); var ajax = AJAX();
ajax.open("POST", PROCESS_REQUEST_FILE, true); ajax.open("POST", PROCESS_REQUEST_FILE, true);
ajax.setRequestHeader("Content-Type", "application/x-www-form-urlencoded;"); ajax.setRequestHeader("Content-Type", "application/x-www-form-urlencoded;");
ajax.onreadystatechange = function() { ajax.onreadystatechange = function() {
if(ajax.readyState == 4) { if(ajax.readyState == 4) {
if(eval(ajax.responseText.trim())){ if(eval(ajax.responseText.trim())){
new leimnud.module.app.confirm().make({ new leimnud.module.app.confirm().make({
label:G_STRINGS.ID_REMOVE_ROLE, label:G_STRINGS.ID_REMOVE_ROLE,
action:function() { 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({ var oRPC = new leimnud.module.rpc.xmlhttp({
url : PROCESS_REQUEST_FILE, url : PROCESS_REQUEST_FILE,
args: uri args: uri
}); });
oRPC.callback = function(rpc){ oRPC.callback = function(rpc){
var oRPC = new leimnud.module.rpc.xmlhttp({ var oRPC = new leimnud.module.rpc.xmlhttp({
url : PROCESS_REQUEST_FILE, url : PROCESS_REQUEST_FILE,
@@ -167,16 +167,16 @@ function deleteRole(ROL_UID) {
window.location = 'roles_List'; window.location = 'roles_List';
}.extend(this); }.extend(this);
oRPC.make(); oRPC.make();
}.extend(this) }.extend(this)
}); });
} }
else else
{ {
new leimnud.module.app.alert().make({label: G_STRINGS.ID_ROLES_CAN_NOT_DELETE}); new leimnud.module.app.alert().make({label: G_STRINGS.ID_ROLES_CAN_NOT_DELETE});
return false; return false;
} }
} }
} }
ajax.send(uri); ajax.send(uri);
}; };
@@ -189,7 +189,7 @@ function usersIntoRole(ROL_UID)
} }
function deleteUserRole(ROL_UID, USR_UID){ function deleteUserRole(ROL_UID, USR_UID){
new leimnud.module.app.confirm().make({ new leimnud.module.app.confirm().make({
label:G_STRINGS.ID_MSG_CONFIRM, label:G_STRINGS.ID_MSG_CONFIRM,
action:function(){ action:function(){
@@ -219,7 +219,7 @@ oPanel = new leimnud.module.panel();
fx :{modal:true,opacity:true,blinkToFront:false,fadeIn:false,drag:true} fx :{modal:true,opacity:true,blinkToFront:false,fadeIn:false,drag:true}
}; };
oPanel.events = { oPanel.events = {
remove: function() { remove: function() {
delete(oPanel); delete(oPanel);
resetChecks(); resetChecks();
}.extend(this) }.extend(this)
@@ -237,7 +237,7 @@ oPanel = new leimnud.module.panel();
}); });
oRPC.make(); oRPC.make();
currentPopupWindow.clearContent(); currentPopupWindow.clearContent();
currentPopupWindow.addContent(oRPC.xmlhttp.responseText); currentPopupWindow.addContent(oRPC.xmlhttp.responseText);
} }
var checks_selected_Rolid = new Array(); var checks_selected_Rolid = new Array();
function showUsersLoad( ROL_UID ){ function showUsersLoad( ROL_UID ){
@@ -253,7 +253,7 @@ function showUsersLoad( ROL_UID ){
fx :{modal:true,opacity:true,blinkToFront:false,fadeIn:false,drag:true} fx :{modal:true,opacity:true,blinkToFront:false,fadeIn:false,drag:true}
}; };
oPanel.events = { oPanel.events = {
remove: function() { remove: function() {
delete(oPanel); delete(oPanel);
resetChecks(); resetChecks();
}.extend(this) }.extend(this)
@@ -267,7 +267,7 @@ function showUsersLoad( ROL_UID ){
}); });
//currentPopupWindow.clearContent(); //currentPopupWindow.clearContent();
//currentPopupWindow.addContent(oRPC.xmlhttp.responseText); //currentPopupWindow.addContent(oRPC.xmlhttp.responseText);
checks_selected_Rolid.push(ROL_UID); checks_selected_Rolid.push(ROL_UID);
oRPC.callback = function(rpc) { oRPC.callback = function(rpc) {
oPanel.loader.hide(); oPanel.loader.hide();
@@ -287,11 +287,11 @@ function showUsersLoad( ROL_UID ){
}; };
}catch(e){alert(e)} }catch(e){alert(e)}
} }
} }
}.extend(this); }.extend(this);
oRPC.make(); oRPC.make();
} }
function assignUserToRole(ROL_UID, USR_UID) function assignUserToRole(ROL_UID, USR_UID)
{ {
@@ -303,13 +303,13 @@ function assignUserToRole(ROL_UID, USR_UID)
}); });
oRPC.make(); oRPC.make();
currentPopupWindow.clearContent(); currentPopupWindow.clearContent();
currentPopupWindow.addContent(oRPC.xmlhttp.responseText); currentPopupWindow.addContent(oRPC.xmlhttp.responseText);
} }
function viewPermitions(ROL_UID) function viewPermitions(ROL_UID)
{ {
var uri = 'request=viewPermitions&ROL_UID='+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) function showPermissions(ROL_UID)
@@ -327,7 +327,7 @@ function showPermissions(ROL_UID)
function assignPermissionToRole(ROL_UID, PER_UID) function assignPermissionToRole(ROL_UID, PER_UID)
{ {
var oRPC = new leimnud.module.rpc.xmlhttp({ var oRPC = new leimnud.module.rpc.xmlhttp({
url : PROCESS_REQUEST_FILE, url : PROCESS_REQUEST_FILE,
async : false, async : false,
@@ -336,11 +336,11 @@ function assignPermissionToRole(ROL_UID, PER_UID)
}); });
oRPC.make(); oRPC.make();
currentPopupWindow.clearContent(); currentPopupWindow.clearContent();
currentPopupWindow.addContent(oRPC.xmlhttp.responseText); currentPopupWindow.addContent(oRPC.xmlhttp.responseText);
} }
function deletePermissionRole(ROL_UID, PER_UID){ function deletePermissionRole(ROL_UID, PER_UID){
new leimnud.module.app.confirm().make({ new leimnud.module.app.confirm().make({
label:G_STRINGS.ID_MSG_CONFIRM, label:G_STRINGS.ID_MSG_CONFIRM,
action:function(){ action:function(){
@@ -382,14 +382,14 @@ function backUsers(ROL_UID)
currentPopupWindow.clearContent(); currentPopupWindow.clearContent();
currentPopupWindow.addContent(oRPC.xmlhttp.responseText); currentPopupWindow.addContent(oRPC.xmlhttp.responseText);
} }
function AJAX() function AJAX()
{ {
try { try {
xmlhttp = new XMLHttpRequest(); xmlhttp = new XMLHttpRequest();
} }
catch(generic_error) { catch(generic_error) {
try { try {
xmlhttp = new ActiveXObject("Msxml2.XMLHTTP"); xmlhttp = new ActiveXObject("Msxml2.XMLHTTP");
@@ -403,10 +403,9 @@ function AJAX()
} }
return xmlhttp; return xmlhttp;
} }
String.prototype.trim = function() String.prototype.trim = function () {
{ return this.replace(/^\s+|\s+$/g, "");
return this.replace(/^\s+|\s+get/g,"");
} }
function $(id){ function $(id){
@@ -433,7 +432,7 @@ function saveUsers(){
resetChecks(); resetChecks();
oRPC.make(); oRPC.make();
currentPopupWindow.remove(); currentPopupWindow.remove();
usersIntoRole(rolUid); usersIntoRole(rolUid);
} }