fernando/luos
1
0
Fork 0
Code Releases Activity

Merge branch '2.0' of git.colosa.net:processmaker into 2.0

Browse Source
This commit is contained in:
erik
2011-03-17 12:33:12 -04:00
parent 03c0cd263f 0daa3254a0
commit 73333f652d
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2397,9 +2397,14 @@ class XmlForm_Field_Dropdown extends XmlForm_Field {
{
$result = array ();
$r = 1;
<<<<<<< HEAD
if(! isset($owner->modeGrid)) $owner->modeGrid = '';
$this->modeGridDrop = $owner->modeGrid;
=======
if(isset($owner->modeGrid))
$this->modeGridDrop = $owner->modeGrid;
>>>>>>> 63d86b9... Adjustment to establish mode the Grids Tables, and elements (validation)
$this->mode = $this->modeForGrid;
foreach ( $values as $v ) {
$result [] = $this->render ( $v, $owner, '[' . $owner->name . '][' . $r . ']', $onlyValue, $r, $therow );