fernando/luos
1
0
Fork 0
Code Releases Activity

BUG-6855 Error message in 'Database Conections' clicking in Edit or Delete title.

Browse Source 
I put an 'IF' validation in file 'gulliver/methods/propelTableAjax.php', to prevent that this columns were sortable.
This commit is contained in:
jennylee
2012-11-23 17:43:05 -04:00
parent 27482e8624
commit 1079ae5eee
2 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
gulliver/methods/propelTableAjax.php
View File

@@ -36,8 +36,8 @@
//THIS BLOCK SET THE FILTER VARIABLES
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 ( !is_file ( $sPath . G::getUIDName( $ntable->filterForm_Id ) ) ) {
$aux = explode ( PATH_SEP, G::getUIDName( $ntable->filterForm_Id ) );
@@ -49,11 +49,11 @@
}
}
}
$filterForm=new filterForm(G::getUIDName( $ntable->filterForm_Id ),$sPath);
$filterForm->values=$_SESSION[$filterForm->id];
parse_str( urldecode(get_ajax_value('filter')) , $newValues);
if (isset($newValues['form'])) {
@@ -77,10 +77,10 @@
//order by
$orderBy = get_ajax_value('order');
if (isset($orderBy)) {
$orderBy = urldecode($orderBy);
$ntable->orderBy = $orderBy;
}
if (isset($orderBy) && $orderBy !== 'ZDZXRHkzVzNmWVE___%3DASC' && $orderBy !== 'ZDZXRHkzUzRnSFhFdVE___%3DASC' && $orderBy !== 'ZXFpRXk0VzhlQQ______%3DASC') {
$orderBy = urldecode($orderBy);
$ntable->orderBy = $orderBy;
}
if ( isset($page) && $page!=='' ) $ntable->currentPage = (int) $page;

12
workflow/engine/xmlform/dbConnections/dbConnections.xml
View File

@@ -21,14 +21,16 @@
<en>Description</en>
</DBS_DESCRIPTION>
<DBS_EDIT type="link" colWidth="50" link="javascript:editDbConnection(&#039;@#DBS_UID&#039;)">
<en>Edit</en>
<DBS_EDIT type="link" colWidth="50" value="Edit" link="javascript:editDbConnection(&#039;@#DBS_UID&#039;)">
<en></en>
</DBS_EDIT>
<DBS_DELETE type="link" colWidth="50" link="javascript:deleteDbConnection(&#039;@#DBS_UID&#039;,&#039;@#PRO_UID&#039;)">
<en>Delete</en>
<DBS_DELETE type="link" colWidth="50" value="Delete" link="javascript:deleteDbConnection(&#039;@#DBS_UID&#039;,&#039;@#PRO_UID&#039;)">
<en></en>
</DBS_DELETE>
<GET_UID type="link" colWidth="40" value="UID" link="#" onclick="msgBox(&#039;UID: &#039;+@QDBS_UID, &#039;info&#039;);return false;"/>
<GET_UID type="link" colWidth="40" value="UID" link="#" onclick="msgBox(&#039;UID: &#039;+@QDBS_UID, &#039;info&#039;);return false;"/>
</dynaForm>