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

Merge pull request #1124 from julceslauhub/master

Browse Source 
BUG 10229 Al hacer correr una caso con campo dependientes, el mismo ya jala los datos del primer registro SOLVED
This commit is contained in:
julceslauhub
2012-12-20 13:06:55 -08:00
parent b8bc343038 d30ff7c8bc
commit 07b87753d0
9 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gulliver/methods/defaultAjax.php
View File

@@ -111,13 +111,12 @@ for ($r = 0; $r < sizeof( $newValues ); $r ++) {
foreach ($v[$_POST['row']] as $k1 => $v1) {
$myDependentFields = subDependencies( $k1, $G_FORM, $aux, $_POST['grid'] );
$_SESSION[$G_FORM->id][$_POST['grid']][$_POST['row']][$k1] = $v1;
$G_FORM->values[$_POST['grid']][$_POST['row']][$k1] = $v1;
}
}
$dependentFields = array_merge( $dependentFields, $myDependentFields );
}
}
if (isset( $_POST['grid'] ))
$G_FORM->values = isset( $_SESSION[$G_FORM->id] ) ? $_SESSION[$G_FORM->id] : array ();
$dependentFields = array_unique( $dependentFields );

6
workflow/engine/classes/class.toolBar.php
View File

@@ -162,7 +162,7 @@ class XmlForm_Field_toolButton extends XmlForm_Field
$criteria = processMap::getDynaformsCriteria($this->owner->values['PRO_UID']);
$dataset = DynaformPeer::doSelectRS($criteria);
if ($dataset->getRecordCount() > 0) {
$html .= '<span style="font-size: 8pt;margin-left: 20px;">' . G::LoadTranslation('ID_EDITING_DYNAFORM');
$html .= '<span style="display:inline-block; font-size: 8pt;margin-left: 5px;margin-bottom: 3px;">' . G::LoadTranslation('ID_DYNAFORM');
$html .= ': <select id="_dynaformsList_" onchange="window.location = \'dynaforms_Editor?PRO_UID=' . $this->owner->values['PRO_UID'];
$html .= '&DYN_UID=\' + this.value;" class="module_app_input___gray">';
$dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
@@ -179,8 +179,8 @@ class XmlForm_Field_toolButton extends XmlForm_Field
return $html;
break;
case 'class':
$html = '<a href="#" onclick="' . $this->onclick . '" onmouseover="backImage(this, \'url(/images/dynamicForm/hover.gif) no-repeat\')" onmouseout="backImage(this, \'\')" style="width:25px;height:25px;margin-bottom:3px">
<div class="' . $this->class . '" title="' . strip_tags( $this->label ) . '" style="width:25px;height:25px;margin-bottom:3px"></div>
$html = '<a href="#" onclick="' . $this->onclick . '" onmouseover="backImage(this, \'url(/images/dynamicForm/hover.gif) no-repeat\')" onmouseout="backImage(this, \'\')" style="height:25px;margin-bottom:3px">
<div class="' . $this->class . '" title="' . strip_tags( $this->label ) . '" style="height:25px;margin-bottom:3px"></div>
</a>';
return $html;

2
workflow/engine/skinEngine/base/css/sprite.css
View File

@@ -30,7 +30,7 @@ Sprite modificado de http://ajaxbestiary.com/Labs/SilkSprite/
.button_menu_ext{padding-left:20px !important;height:18px !important;}
.button_large_ext{padding-left:20px !important;height:32px !important;}
.button_toolbar{padding-left:20px !important;height:18px !important;font-size:15px;cursor:pointer;margin:0 3px 1px 3px;line-height:25px}
.button_toolbar{padding-left:18px !important;height:18px !important;font-size:15px;cursor:pointer;margin:0 2px 1px 3px;line-height:25px}
.ss_accept{background-position:0 0 !important}
.ss_add{background-position:0 -19px !important}
.ss_anchor{background-position:0 -37px !important}

2
workflow/engine/skinEngine/uxmodern/css/sprite.css
View File

@@ -30,7 +30,7 @@ Sprite modificado de http://ajaxbestiary.com/Labs/SilkSprite/
.button_menu_ext{padding-left:20px !important;height:18px !important;}
.button_large_ext{padding-left:20px !important;height:32px !important;}
.button_toolbar{padding-left:20px !important;height:18px !important;font-size:15px;cursor:pointer;margin:0 3px 1px 3px;line-height:25px}
.button_toolbar{padding-left:18px !important;height:18px !important;font-size:15px;cursor:pointer;margin:0 2px 1px 3px;line-height:25px}
.ss_accept{background-position:0 0 !important}
.ss_add{background-position:0 -19px !important}
.ss_anchor{background-position:0 -37px !important}

2
workflow/engine/skinEngine/uxs/css/sprite.css
View File

@@ -30,7 +30,7 @@ Sprite modificado de http://ajaxbestiary.com/Labs/SilkSprite/
.button_menu_ext{padding-left:20px !important;height:18px !important;}
.button_large_ext{padding-left:20px !important;height:32px !important;}
.button_toolbar{padding-left:20px !important;height:18px !important;font-size:15px;cursor:pointer;margin:0 3px 1px 3px;line-height:25px}
.button_toolbar{padding-left:18px !important;height:18px !important;font-size:15px;cursor:pointer;margin:0 2px 1px 3px;line-height:25px}
.ss_accept{background-position:0 0 !important}
.ss_add{background-position:0 -19px !important}
.ss_anchor{background-position:0 -37px !important}

5
workflow/engine/templates/toolbar.html
View File

@@ -8,14 +8,15 @@
<tr>
{php}$this->assign('cols', 0);{/php}
{foreach from=$form->fields item=field index=abc}
{if ($field->type!='private')}
<td>
{if ($field->type==='javascript')}
{elseif ($field->type==='phpvariable')}
{elseif ($field->type==='private')}
{elseif ($field->type==='')}
{else}
{* elseif ($field->type==='link') || ($field->type==='menu') *}{$field->field}{/if}
</td>
</td>
{/if}
{/foreach}
{php}

2
workflow/engine/xmlform/dynaforms/fields_Toolbar.xml
View File

@@ -2,7 +2,7 @@
<dynaForm name="fields_Toolbar" version="1.0" type="toolbar" align="left" width="100%">
<PRO_UID type="private" />
<DYN_UID type="private" />
<separator1 type="toolButton" file="images/dynamicForm/separatorTable.gif" home="public_html" buttonStyle=""/>
<!--<separator1 type="toolButton" file="images/dynamicForm/separatorTable.gif" home="public_html" buttonStyle=""/>-->
<saveDyna type="toolButton" class="ss_sprite button_toolbar ss_disk" onclick="dynaformEditor.save()" home="public_html" buttonType="class">
<en>Save</en>
</saveDyna>

2
workflow/engine/xmlform/dynaforms/fields_ToolbarGrid.xml
View File

@@ -2,7 +2,7 @@
<dynaForm name="fields_Toolbar" version="1.0" type="toolbar" align="left" width="894px">
<PRO_UID type="private" />
<DYN_UID type="private" />
<separator1 type="toolButton" file="images/dynamicForm/separatorTable.gif" home="public_html" buttonStyle=""/>
<!--<separator1 type="toolButton" file="images/dynamicForm/separatorTable.gif" home="public_html" buttonStyle=""/>-->
<saveDyna type="toolButton" class="ss_sprite button_toolbar ss_disk" onclick="dynaformEditor.save()" buttonType="class">
<en>Save</en>
</saveDyna>

BIN
workflow/public_html/images/dynamicForm/hover.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 560 B

After

Width:  |  Height:  |  Size: 1.3 KiB