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

Merged in bugfix/HOR-3618-C (pull request #5863)

Browse Source 
HOR-3618

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
This commit is contained in:
Paula Quispe
2017-08-05 15:35:49 +00:00
parent 0f120dbb88 6f26e43bd9
commit e0c81c4662
3 changed files with 138 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

131
gulliver/methods/pagedTableAjax.php
View File

@@ -23,77 +23,76 @@
* *
*/ */
G::LoadAllPluginModelClasses();
$id=get_ajax_value('ptID');
$ntable = unserialize(base64_decode($_SESSION['pagedTable[' . $id . ']']));
$page=get_ajax_value('page');
$function=get_ajax_value('function');
if (isset($ntable->filterForm_Id) && ($ntable->filterForm_Id!=='')) {
$id=get_ajax_value('ptID');
$ntable = unserialize(base64_decode($_SESSION['pagedTable[' . $id . ']']));
$page=get_ajax_value('page');
$function=get_ajax_value('function');
if (isset($ntable->filterForm_Id) && ($ntable->filterForm_Id!=='')) {
$filterForm=new filterForm(G::getUIDName( $ntable->filterForm_Id )); $filterForm=new filterForm(G::getUIDName( $ntable->filterForm_Id ));
$filterForm->values=$_SESSION[$filterForm->id]; $filterForm->values=$_SESSION[$filterForm->id];
parse_str( urldecode(get_ajax_value('filter')) , $newValues); parse_str( urldecode(get_ajax_value('filter')) , $newValues);
if (isset($newValues['form'])) { if (isset($newValues['form'])) {
$filterForm->setValues($newValues['form']); $filterForm->setValues($newValues['form']);
$filter = array(); $filter = array();
foreach($filterForm->fields as $fieldName => $field ){ foreach($filterForm->fields as $fieldName => $field ){
if (($field->dataCompareField!=='') && (isset($newValues['form'][$fieldName]))) if (($field->dataCompareField!=='') && (isset($newValues['form'][$fieldName])))
$filter[$field->dataCompareField] = $filterForm->values[$fieldName]; $filter[$field->dataCompareField] = $filterForm->values[$fieldName];
$ntable->filterType[$field->dataCompareField] = $field->dataCompareType; $ntable->filterType[$field->dataCompareField] = $field->dataCompareType;
} }
$ntable->filter = $filter;//G::http_build_query($filter); $ntable->filter = $filter;//G::http_build_query($filter);
} }
} }
$fastSearch=get_ajax_value('fastSearch'); $fastSearch=get_ajax_value('fastSearch');
if (isset($fastSearch)) $ntable->fastSearch= urldecode($fastSearch); if (isset($fastSearch)) $ntable->fastSearch= urldecode($fastSearch);
$orderBy=get_ajax_value('order'); $orderBy=get_ajax_value('order');
if (isset($orderBy)) { if (isset($orderBy)) {
$orderBy=urldecode($orderBy); $orderBy=urldecode($orderBy);
$ntable->orderBy=$orderBy; $ntable->orderBy=$orderBy;
} }
if (isset($page) && $page!=='') $ntable->currentPage=(int) $page; if (isset($page) && $page!=='') $ntable->currentPage=(int) $page;
if (function_exists('pagedTable_BeforeQuery')) pagedTable_BeforeQuery($ntable); if (function_exists('pagedTable_BeforeQuery')) pagedTable_BeforeQuery($ntable);
$ntable->prepareQuery(); $ntable->prepareQuery();
switch ($function) switch ($function)
{ {
case "showHideField": case "showHideField":
$field=get_ajax_value('field'); $field=get_ajax_value('field');
$ntable->style[$field]['showInTable']= $ntable->style[$field]['showInTable']=
($ntable->style[$field]['showInTable']==='0')?'1':'0'; ($ntable->style[$field]['showInTable']==='0')?'1':'0';
break; break;
case "paint": case "paint":
break; break;
case "delete": case "delete":
$ntable->prepareQuery(); $ntable->prepareQuery();
parse_str(get_ajax_value('field'),$field); parse_str(get_ajax_value('field'),$field);
foreach($field as $key => $value) $field[$key]=urldecode($value); foreach($field as $key => $value) $field[$key]=urldecode($value);
$ntable->ses->execute($ntable->replaceDataField($ntable->sqlDelete,$field)); $ntable->ses->execute($ntable->replaceDataField($ntable->sqlDelete,$field));
break; break;
case "update": case "update":
$ntable->prepareQuery(); $ntable->prepareQuery();
parse_str(get_ajax_value('field'),$field); parse_str(get_ajax_value('field'),$field);
foreach($field as $key => $value) $field[$key]=urldecode($value); foreach($field as $key => $value) $field[$key]=urldecode($value);
parse_str(get_ajax_value('update'),$fieldup); parse_str(get_ajax_value('update'),$fieldup);
foreach($fieldup as $key => $value) $field['new'.$key]=urldecode($value); //join foreach($fieldup as $key => $value) $field['new'.$key]=urldecode($value); //join
$ntable->ses->execute($ntable->replaceDataField($ntable->sqlUpdate,$field)); $ntable->ses->execute($ntable->replaceDataField($ntable->sqlUpdate,$field));
break; break;
case "insert": case "insert":
$ntable->prepareQuery(); $ntable->prepareQuery();
parse_str(get_ajax_value('field'),$field); parse_str(get_ajax_value('field'),$field);
foreach($field as $key => $value) $field[$key]=urldecode($value); foreach($field as $key => $value) $field[$key]=urldecode($value);
$ntable->ses->execute($ntable->replaceDataField($ntable->sqlInsert,$field)); $ntable->ses->execute($ntable->replaceDataField($ntable->sqlInsert,$field));
break; break;
case "printForm": case "printForm":
parse_str(get_ajax_value('field'),$field); parse_str(get_ajax_value('field'),$field);
parse_str(get_ajax_value('field'),$field); parse_str(get_ajax_value('field'),$field);
foreach($field as $key => $value) $field[$key]=urldecode($value); foreach($field as $key => $value) $field[$key]=urldecode($value);
$ntable->printForm(get_ajax_value('filename'),$field); $ntable->printForm(get_ajax_value('filename'),$field);
return ; return ;
} }
$ntable->renderTable( 'content' ); $ntable->renderTable( 'content' );
$conf = new Configurations(); $conf = new Configurations();
$conf->setConfig($ntable->__Configuration,$ntable,$conf->aConfig); $conf->setConfig($ntable->__Configuration,$ntable,$conf->aConfig);
$conf->saveConfig('pagedTable',$ntable->__OBJ_UID,'',$_SESSION['USER_LOGGED'],''); $conf->saveConfig('pagedTable',$ntable->__OBJ_UID,'',$_SESSION['USER_LOGGED'],'');
?> ?>

144
gulliver/methods/propelTableAjax.php
View File

@@ -24,26 +24,27 @@
*/ */
/* Includes */ /* Includes */
$id = get_ajax_value('ptID'); G::LoadAllPluginModelClasses();
$ntable = unserialize(base64_decode($_SESSION['pagedTable[' . $id . ']'])); $id = get_ajax_value('ptID');
$page = get_ajax_value('page'); $ntable = unserialize(base64_decode($_SESSION['pagedTable[' . $id . ']']));
$function = get_ajax_value('function'); $page = get_ajax_value('page');
$function = get_ajax_value('function');
//THIS BLOCK SET THE FILTER VARIABLES //THIS BLOCK SET THE FILTER VARIABLES
if (isset($ntable->filterForm_Id) && ($ntable->filterForm_Id!=='')) { if (isset($ntable->filterForm_Id) && ($ntable->filterForm_Id!=='')) {
$sPath = PATH_XMLFORM; $sPath = PATH_XMLFORM;
//if the xmlform file doesn't exist, then try with the plugins folders //if the xmlform file doesn't exist, then try with the plugins folders
if ( !is_file ( $sPath . G::getUIDName( $ntable->filterForm_Id ) ) ) { if ( !is_file ( $sPath . G::getUIDName( $ntable->filterForm_Id ) ) ) {
$aux = explode ( PATH_SEP, G::getUIDName( $ntable->filterForm_Id ) ); $aux = explode ( PATH_SEP, G::getUIDName( $ntable->filterForm_Id ) );
//check if G_PLUGIN_CLASS is defined, because publisher can be called without an environment //check if G_PLUGIN_CLASS is defined, because publisher can be called without an environment
if ( count($aux) == 2 && defined ( 'G_PLUGIN_CLASS' ) ) { if ( count($aux) == 2 && defined ( 'G_PLUGIN_CLASS' ) ) {
$oPluginRegistry =& PMPluginRegistry::getSingleton(); $oPluginRegistry =& PMPluginRegistry::getSingleton();
if ( $oPluginRegistry->isRegisteredFolder($aux[0]) ) { if ( $oPluginRegistry->isRegisteredFolder($aux[0]) ) {
$sPath = PATH_PLUGINS; $sPath = PATH_PLUGINS;
} }
} }
} }
$filterForm=new filterForm(G::getUIDName( $ntable->filterForm_Id ),$sPath); $filterForm=new filterForm(G::getUIDName( $ntable->filterForm_Id ),$sPath);
@@ -52,74 +53,74 @@
$filterForm->values=$_SESSION[$filterForm->id]; $filterForm->values=$_SESSION[$filterForm->id];
parse_str( urldecode(get_ajax_value('filter')) , $newValues); parse_str( urldecode(get_ajax_value('filter')) , $newValues);
if (isset($newValues['form'])) { if (isset($newValues['form'])) {
$filterForm->setValues($newValues['form']); $filterForm->setValues($newValues['form']);
$filter = array(); $filter = array();
foreach($filterForm->fields as $fieldName => $field ){ foreach($filterForm->fields as $fieldName => $field ){
if (($field->dataCompareField!=='') && (isset($newValues['form'][$fieldName]))) if (($field->dataCompareField!=='') && (isset($newValues['form'][$fieldName])))
$filter[$field->dataCompareField] = $filterForm->values[$fieldName]; $filter[$field->dataCompareField] = $filterForm->values[$fieldName];
$ntable->filterType[$field->dataCompareField] = $field->dataCompareType; $ntable->filterType[$field->dataCompareField] = $field->dataCompareType;
} }
$ntable->filter = $filter;//G::http_build_query($filter); $ntable->filter = $filter;//G::http_build_query($filter);
} }
} }
$fastSearch = get_ajax_value('fastSearch'); $fastSearch = get_ajax_value('fastSearch');
if (isset($fastSearch)) { if (isset($fastSearch)) {
$ntable->fastSearch= htmlentities(urldecode($fastSearch), ENT_QUOTES, 'UTF-8'); $ntable->fastSearch= htmlentities(urldecode($fastSearch), ENT_QUOTES, 'UTF-8');
$page = 1; $page = 1;
} }
//order by //order by
$orderBy = get_ajax_value('order'); $orderBy = get_ajax_value('order');
if (isset($orderBy)) { if (isset($orderBy)) {
$orderBy = urldecode($orderBy); $orderBy = urldecode($orderBy);
$ntable->orderBy = $orderBy; $ntable->orderBy = $orderBy;
} }
if ( isset($page) && $page!=='' ) $ntable->currentPage = (int) $page; if ( isset($page) && $page!=='' ) $ntable->currentPage = (int) $page;
if ( function_exists('pagedTable_BeforeQuery')) if ( function_exists('pagedTable_BeforeQuery'))
pagedTable_BeforeQuery($ntable); pagedTable_BeforeQuery($ntable);
//$ntable->prepareQuery(); //$ntable->prepareQuery();
switch ($function) switch ($function)
{ {
case "showHideField": case "showHideField":
$field=get_ajax_value('field'); $field=get_ajax_value('field');
$ntable->style[$field]['showInTable']= $ntable->style[$field]['showInTable']=
($ntable->style[$field]['showInTable']==='0')?'1':'0'; ($ntable->style[$field]['showInTable']==='0')?'1':'0';
break; break;
case "paint": case "paint":
break; break;
case "delete": case "delete":
$ntable->prepareQuery(); $ntable->prepareQuery();
parse_str(get_ajax_value('field'),$field); parse_str(get_ajax_value('field'),$field);
foreach($field as $key => $value) $field[$key]=urldecode($value); foreach($field as $key => $value) $field[$key]=urldecode($value);
$ntable->ses->execute($ntable->replaceDataField($ntable->sqlDelete,$field)); $ntable->ses->execute($ntable->replaceDataField($ntable->sqlDelete,$field));
break; break;
case "update": case "update":
$ntable->prepareQuery(); $ntable->prepareQuery();
parse_str(get_ajax_value('field'),$field); parse_str(get_ajax_value('field'),$field);
foreach($field as $key => $value) $field[$key]=urldecode($value); foreach($field as $key => $value) $field[$key]=urldecode($value);
parse_str(get_ajax_value('update'),$fieldup); parse_str(get_ajax_value('update'),$fieldup);
foreach($fieldup as $key => $value) $field['new'.$key]=urldecode($value); //join foreach($fieldup as $key => $value) $field['new'.$key]=urldecode($value); //join
$ntable->ses->execute($ntable->replaceDataField($ntable->sqlUpdate,$field)); $ntable->ses->execute($ntable->replaceDataField($ntable->sqlUpdate,$field));
break; break;
case "insert": case "insert":
$ntable->prepareQuery(); $ntable->prepareQuery();
parse_str(get_ajax_value('field'),$field); parse_str(get_ajax_value('field'),$field);
foreach($field as $key => $value) $field[$key]=urldecode($value); foreach($field as $key => $value) $field[$key]=urldecode($value);
$ntable->ses->execute($ntable->replaceDataField($ntable->sqlInsert,$field)); $ntable->ses->execute($ntable->replaceDataField($ntable->sqlInsert,$field));
break; break;
case "printForm": case "printForm":
parse_str(get_ajax_value('field'),$field); parse_str(get_ajax_value('field'),$field);
parse_str(get_ajax_value('field'),$field); parse_str(get_ajax_value('field'),$field);
foreach($field as $key => $value) $field[$key]=urldecode($value); foreach($field as $key => $value) $field[$key]=urldecode($value);
$ntable->printForm(get_ajax_value('filename'),$field); $ntable->printForm(get_ajax_value('filename'),$field);
return ; return ;
} }
$ntable->renderTable("content"); $ntable->renderTable("content");
@@ -131,4 +132,3 @@ if (isset($_SESSION["USER_LOGGED"])) {
} else { } else {
$conf->saveConfig("pagedTable", $ntable->__OBJ_UID); $conf->saveConfig("pagedTable", $ntable->__OBJ_UID);
} }

2
gulliver/system/class.objectTemplate.php
View File

@@ -33,7 +33,7 @@
* @access public * @access public
*/ */
class objectTemplate extends smarty class objectTemplate extends Smarty
{ {
/** /**