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

Merge pull request #996 from Jennydmz/BUG-6855

Browse Source 
BUG-6855 Error message in 'Database Conections' clicking in Edit or Delete title.
This commit is contained in:
julceslauhub
2012-11-27 07:07:27 -08:00
parent 1804224a12 7604e72740
commit 295ca5216c
3 changed files with 20 additions and 14 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 = urldecode($orderBy);
$ntable->orderBy = $orderBy;
}
if ( isset($page) && $page!=='' ) $ntable->currentPage = (int) $page;

11
workflow/engine/classes/class.propelTable.php
View File

@@ -338,8 +338,13 @@ class propelTable
$this->tpl->newBlock( "headers" );
$sortOrder = (((isset( $this->aOrder[$this->fields[$r]['Name']] )) && ($this->aOrder[$this->fields[$r]['Name']] === 'ASC')) ? 'DESC' : 'ASC');
$sortOrder = (((isset( $this->aOrder[$this->fields[$r]['Name']] )) && ($this->aOrder[$this->fields[$r]['Name']] === 'DESC')) ? '' : $sortOrder);
$this->style[$r]['href'] = $this->ownerPage . '?order=' . ($sortOrder !== '' ? (G::createUID( '', $this->fields[$r]['Name'] ) . '=' . $sortOrder) : '') . '&page=' . $this->currentPage;
$this->style[$r]['onsort'] = $this->id . '.doSort("' . G::createUID( '', $this->fields[$r]['Name'] ) . '" , "' . $sortOrder . '");return false;';
if ($this->style[$r]['titleVisibility'] != '0') {
$this->style[$r]['href'] = $this->ownerPage . '?order=' . ($sortOrder !== '' ? (G::createUID( '', $this->fields[$r]['Name'] ) . '=' . $sortOrder) : '') . '&page=' . $this->currentPage;
$this->style[$r]['onsort'] = $this->id . '.doSort("' . G::createUID( '', $this->fields[$r]['Name'] ) . '" , "' . $sortOrder . '");return false;';
} else {
$this->style[$r]['href'] = '#';
$this->style[$r]['onsort'] = 'return false;';
}
if (isset( $this->style[$r]['href'] )) {
$this->tpl->assign( "href", $this->style[$r]['href'] );
}
@@ -492,7 +497,7 @@ class propelTable
}
}
//Hidden titles
if (! (strpos( ' linknew button endgrid2 ', ' ' . $this->fields[$r]['Type'] . ' ' ) === false)) {
if (! (strpos( ' linknew button link endgrid2 ', ' ' . $this->fields[$r]['Type'] . ' ' ) === false)) {
$this->style[$r]['titleVisibility'] = '0';
}
//Align titles

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

@@ -29,6 +29,7 @@
<en>Delete</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>