fernando/luos
1
0
Fork 0
Code Releases 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>
* @Return <none>
*/
String.prototype.trim = function() {
return this.replace(/^\s+|\s+get/g,"");
String.prototype.trim = function () {
return this.replace(/^\s+|\s+$/g, "");
}
function clearCalendar(id){
@@ -2114,10 +2114,21 @@ function _()
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 len = 0;
for (var i = 0; i < str.length; i++) {
len += str.charCodeAt(i) < 0 || str.charCodeAt(i) > 255 ? 2 : 1;
}
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)
*/
String.prototype.trim = function() {
return this.replace(/^\s+|\s+get/g,"");
//return Ext.util.Format.trim(this);
String.prototype.trim = function () {
return this.replace(/^\s+|\s+$/g, "");
}
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;
sw = true;
}
if (tamData >= tamMask){
if (tamData >= tamMask){
var minusExi;
for (var numI = 0; newValue.length > numI; numI++) {
var campVal = newValue[numI];
@@ -1073,7 +1073,7 @@ function G_Text(form, element, name)
}
}
}
if (!(keyCode == 45 || (minusExi && tamMask >= tamData))) {
if (sw && !swPeriod && testData.indexOf(me.comma_separator) == -1){
action = 'none';
@@ -1081,7 +1081,7 @@ function G_Text(form, element, name)
if (!sw) action = 'none';
}
}
}
}
switch(action){
case 'mask': case 'move':
dataNewMask = me.replaceMasks(newValue, newCursor);
@@ -3547,11 +3547,5 @@ function dateSetMask(mask) {
return mask;
}
function stringReplace(strSearch, stringReplace, str)
{
var expression = eval("/" + strSearch + "/g");
return str.replace(expression, stringReplace);
}
/* end file */

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

File diff suppressed because it is too large Load Diff

90
gulliver/methods/genericAjax.php
View File

@@ -1,4 +1,4 @@
<?php
<?php
$request = isset($_POST['request'])? $_POST['request']: null;
if( !isset($request) ){
@@ -9,18 +9,18 @@ if( isset($request) ){
case 'deleteGridRowOnDynaform':
// This code is to update the SESSION variable for dependent fields in grids
$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']]);
$initialKey = 1;
$initialKey = 1;
foreach ($_SESSION[$_POST['formID']][$_POST['gridname']] as $key => $value) {
if ($key != $_POST['rowpos']) {
if ($key != $_POST['rowpos']) {
$oFields[$initialKey] = $value;
$initialKey++;
$initialKey++;
}
}
unset($_SESSION[$_POST['formID']][$_POST['gridname']]);
$_SESSION[$_POST['formID']][$_POST['gridname']] = $oFields;
$_SESSION[$_POST['formID']][$_POST['gridname']] = $oFields;
/* if( isset($_SESSION['APPLICATION']) ){
G::LoadClass('case');
$oApp= new Cases();
@@ -31,9 +31,9 @@ if( isset($request) ){
$oFields[$initialKey] = $value;
$initialKey++;
$aFields['APP_DATA'][$_POST['gridname']] = $oFields;
}
}
$oApp->updateCase($_SESSION['APPLICATION'], $aFields);
}
}
*/
break;
/** widgets **/
@@ -41,8 +41,8 @@ if( isset($request) ){
try {
if(isset($_GET["inputEnconde64"])) {
$_GET['input'] = base64_decode($_GET['input']);
}
$_GET['input'] = base64_decode($_GET['input']);
}
$sData = base64_decode(str_rot13($_GET['hash']));
list($SQL, $DB_UID) = explode('@|', $sData);
// Remplace values for dependent fields
@@ -57,7 +57,7 @@ if( isset($request) ){
$parser = new PHPSQLParser($SQL);
// Verif parsed array
// print_r($parser->parsed);
// print_r($parser->parsed);
$SQL = queryModified($parser->parsed, $_GET['input']);
$aRows = Array();
@@ -130,7 +130,7 @@ if( isset($request) ){
$arr = array();
$aReplace = array("(\r\n)", "(\n\r)", "(\n)", "(\r)");
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 "]}";
@@ -168,12 +168,14 @@ if( isset($request) ){
}
$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 = eregi_replace("[\n|\r|\n\r]", ' ', $err);
$err = preg_replace("[\n|\r|\n\r]", ' ', $err); // Made compatible to PHP 5.3
echo '{result:1, message:"'.$err.'"}';
$err = preg_replace("[\n|\r|\n\r]", " ", $err); //Made compatible to PHP 5.3
echo "{status: 0, message: \"" . $err . "\"}";
}
break;
}
@@ -213,31 +215,31 @@ function sortByChar($aRows, $charSel)
* Converts a SQL array parsing to a SQL string.
* @param string $sqlParsed
* @param string $inputSel default value empty string
* @return string
* @return string
*/
function queryModified($sqlParsed, $inputSel = "")
function queryModified($sqlParsed, $inputSel = "")
{
if(!empty($sqlParsed['SELECT'])) {
$sqlSelect = "SELECT ";
$aSelect = $sqlParsed['SELECT'];
$sFieldSel = (count($aSelect)>1 ) ? $aSelect[1]['base_expr'] : $aSelect[0]['base_expr'];
foreach($aSelect as $key => $value ) {
if($key != 0)
if($key != 0)
$sqlSelect .= ", ";
$sAlias = str_replace("`","", $aSelect[$key]['alias']);
$sBaseExpr = $aSelect[$key]['base_expr'];
switch($aSelect[$key]['expr_type']){
case 'colref' : if($sAlias === $sBaseExpr)
$sqlSelect .= $sAlias;
else
else
$sqlSelect .= $sBaseExpr . ' AS ' . $sAlias;
break;
case 'expression' : if($sAlias === $sBaseExpr)
case 'expression' : if($sAlias === $sBaseExpr)
$sqlSelect .= $sBaseExpr;
else
else
$sqlSelect .= $sBaseExpr . ' AS ' . $sAlias;
break;
case 'subquery' : if(strpos($sAlias, $sBaseExpr,0) != 0)
@@ -245,9 +247,9 @@ function queryModified($sqlParsed, $inputSel = "")
else
$sqlSelect .= $sBaseExpr . " AS " . $sAlias;
break;
case 'operator' : $sqlSelect .= $sBaseExpr;
case 'operator' : $sqlSelect .= $sBaseExpr;
break;
default : $sqlSelect .= $sBaseExpr;
default : $sqlSelect .= $sBaseExpr;
break;
}
}
@@ -260,7 +262,7 @@ function queryModified($sqlParsed, $inputSel = "")
if($key == 0) {
$sqlFrom .= $aFrom[$key]['table'] . (($aFrom[$key]['table'] == $aFrom[$key]['alias'])?"" : " " . $aFrom[$key]['alias']);
} 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'] ;
}
@@ -271,48 +273,48 @@ function queryModified($sqlParsed, $inputSel = "")
if(!empty($sqlParsed['WHERE'])){
$sqlWhere = " WHERE ";
$aWhere = $sqlParsed['WHERE'];
foreach($aWhere as $key => $value ){
foreach($aWhere as $key => $value ){
$sqlWhere .= $value['base_expr'] . " ";
}
$sqlWhere .= " AND " . $sFieldSel . " LIKE '%". $inputSel . "%'";
}
}
else {
$sqlWhere = " WHERE " . $sFieldSel . " LIKE '%". $inputSel ."%' ";
}
$sqlGroupBy = "";
if(!empty($sqlParsed['GROUP'])){
if(!empty($sqlParsed['GROUP'])){
$sqlGroupBy = "GROUP BY ";
$aGroup = $sqlParsed['GROUP'];
foreach($aGroup as $key => $value ){
if($key != 0)
foreach($aGroup as $key => $value ){
if($key != 0)
$sqlGroupBy .= ", ";
if($value['direction'] == 'ASC' )
$sqlGroupBy .= $value['base_expr'];
else
else
$sqlGroupBy .= $value['base_expr'] . " " . $value['direction'];
}
}
$sqlHaving = "";
if(!empty($sqlParsed['HAVING'])){
if(!empty($sqlParsed['HAVING'])){
$sqlHaving = "HAVING ";
$aHaving = $sqlParsed['HAVING'];
foreach($aHaving as $key => $value ){
foreach($aHaving as $key => $value ){
$sqlHaving .= $value['base_expr'] . " ";
}
}
$sqlOrderBy = "";
if(!empty($sqlParsed['ORDER'])){
if(!empty($sqlParsed['ORDER'])){
$sqlOrderBy = "ORDER BY ";
$aOrder = $sqlParsed['ORDER'];
foreach($aOrder as $key => $value ){
if($key != 0)
foreach($aOrder as $key => $value ){
if($key != 0)
$sqlOrderBy .= ", ";
if($value['direction'] == 'ASC' )
$sqlOrderBy .= $value['base_expr'];
else
else
$sqlOrderBy .= $value['base_expr'] . " " . $value['direction'];
}
} else {
@@ -320,7 +322,7 @@ function queryModified($sqlParsed, $inputSel = "")
}
$sqlLimit = "";
if(!empty($sqlParsed['LIMIT'])){
if(!empty($sqlParsed['LIMIT'])){
$sqlLimit = "LIMIT ". $sqlParsed['LIMIT']['start'] . ", " . $sqlParsed['LIMIT']['end'];
}
@@ -329,15 +331,15 @@ function queryModified($sqlParsed, $inputSel = "")
if(!empty($sqlParsed['CALL'])){
$sCall = "CALL ";
$aCall = $sqlParsed['CALL'];
foreach($aCall as $key => $value ){
foreach($aCall as $key => $value ){
$sCall .= $value . " ";
}
}
return $sCall;
}
if(!empty($sqlParsed['EXECUTE'])){
$sCall = "EXECUTE ";
$aCall = $sqlParsed['EXECUTE'];
foreach($aCall as $key => $value ){
foreach($aCall as $key => $value ){
$sCall .= $value . " ";
}
return $sCall;
@@ -345,7 +347,7 @@ function queryModified($sqlParsed, $inputSel = "")
if(!empty($sqlParsed[''])){
$sCall = "";
$aCall = $sqlParsed[''];
foreach($aCall as $key => $value ){
foreach($aCall as $key => $value ){
$sCall .= $value . " ";
}
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.'"',
);
$storeEntry = '';
if($this->store_new_entry){
$storeEntry = 'onchange="storeEntry(this, \''.$this->sqlConnection.'\', \''.$this->table.'\', \''.$this->primary_key.'\', \''.$this->primary_key_type.'\', \''.$this->field.'\')"';
$storeEntry = null;
$storeEntryData = ", storeEntryData: [0]";
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 = '';
@@ -1269,10 +1272,11 @@ class XmlForm_Field_Suggest extends XmlForm_Field_SimpleText //by neyek
$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 sField = "[]"; ';
if ($count > 0) {
for ($cnt = 0; $cnt < $count; $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 .= $sCallBack . '; getField("' . $this->name . '").value = obj.id;';
$sOptions .= 'var response = ajax_function("../gulliver/defaultAjaxDynaform", "reloadField", ';
$sOptions .= ' "form=' . $owner->id . '&fields=" + sField, "POST"); ';
@@ -1316,11 +1319,12 @@ class XmlForm_Field_Suggest extends XmlForm_Field_SimpleText //by neyek
$sOptions .= '} else { ';
$sOptions .= ' alert(\'Invalid response: \' + response); ' ;
$sOptions .= '} ';
$sOptions .= 'return false; }';
$sOptions .= '} ';
$sOptions .= 'return false; ';
$sOptions .= '}';
$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>';
return $str;

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

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

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

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