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

BUG 9508 I changed the variable name

Browse Source 
I changed thevariable name adjustgridswith for adjustgridswidth
This commit is contained in:
Brayan Osmar Pereyra Suxo
2012-10-04 15:33:11 -04:00
parent 1d8b2671c1
commit ac920502cf
5 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -47,7 +47,7 @@ class Form extends XmlForm
var $objectRequiredFields = null; var $objectRequiredFields = null;
var $nextstepsave = ''; var $nextstepsave = '';
var $printdynaform = ''; var $printdynaform = '';
var $adjustgridswith = '0'; var $adjustgridswidth = '0';
public $visual_frontend; public $visual_frontend;

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

@@ -3297,7 +3297,7 @@ class XmlForm_Field_Grid extends XmlForm_Field
$emptyRow [$key] = array ($emptyValue); $emptyRow [$key] = array ($emptyValue);
} }
if (isset($owner->adjustgridswith) && $owner->adjustgridswith == '1') { if (isset($owner->adjustgridswidth) && $owner->adjustgridswidth == '1') {
// 400w -> 34s to Firefox // 400w -> 34s to Firefox
// 400w -> 43s to Chrome // 400w -> 43s to Chrome

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

@@ -716,7 +716,7 @@ class dynaformEditorAjax extends dynaformEditor implements iDynaformEditorAjax
//'ENABLETEMPLATE'=> $form->enableTemplate, //'ENABLETEMPLATE'=> $form->enableTemplate,
'MODE' => $form->mode, 'MODE' => $form->mode,
'PRINTDYNAFORM' => $form->printdynaform, 'PRINTDYNAFORM' => $form->printdynaform,
'ADJUSTGRIDSWITH'=> $form->adjustgridswith, 'ADJUSTGRIDSWIDTH' => $form->adjustgridswith,
'NEXTSTEPSAVE' => $form->nextstepsave 'NEXTSTEPSAVE' => $form->nextstepsave
); );
$tmp['Properties']=$Properties; $tmp['Properties']=$Properties;
@@ -777,8 +777,8 @@ class dynaformEditorAjax extends dynaformEditor implements iDynaformEditorAjax
if (isset($Fields['PRINTDYNAFORM'])) { if (isset($Fields['PRINTDYNAFORM'])) {
$ses2->execute(G::replaceDataField("UPDATE . SET PRINTDYNAFORM = @@PRINTDYNAFORM WHERE XMLNODE_NAME = 'dynaForm' ", $Fields)); $ses2->execute(G::replaceDataField("UPDATE . SET PRINTDYNAFORM = @@PRINTDYNAFORM WHERE XMLNODE_NAME = 'dynaForm' ", $Fields));
} }
if (isset($Fields['ADJUSTGRIDSWITH'])) { if (isset($Fields['ADJUSTGRIDSWIDTH'])) {
$ses2->execute(G::replaceDataField("UPDATE . SET ADJUSTGRIDSWITH = @@ADJUSTGRIDSWITH WHERE XMLNODE_NAME = 'dynaForm' ", $Fields)); $ses2->execute(G::replaceDataField("UPDATE . SET ADJUSTGRIDSWIDTH = @@ADJUSTGRIDSWIDTH WHERE XMLNODE_NAME = 'dynaForm' ", $Fields));
} }
return 0; return 0;
} }

4
workflow/engine/templates/grid.html
View File

@@ -8,13 +8,12 @@
<th>{$form->label}</th> <th>{$form->label}</th>
</tr> </tr>
</table> </table>
<table class="tableGrid" align="center" id="form[{$form->name}]" cellpadding="0" cellspacing="0"> <table class="tableGrid" align="center" id="form[{$form->name}]" cellpadding="0" cellspacing="0">
<tr><td valign='top'> <tr><td valign='top'>
{if ($form->addRow) } {if ($form->addRow) }
<table class='Record'> <table class='Record'>
<tr><td></td> <tr><td></td>
<td> <img id="form[{$form->name}][bullet]" src="/images/bulletButton.gif" />&nbsp;<a id="form[{$form->name}][addLink]" class="GridLink" href="javascript:;" value="Insert" onclick="form_{$form->owner->id}.getElementByName('{$form->name}').addGridRow(); return false;">{$form->NewLabel}</a></td> <td><img id="form[{$form->name}][bullet]" src="/images/bulletButton.gif" />&nbsp;<a id="form[{$form->name}][addLink]" class="GridLink" href="javascript:;" value="Insert" onclick="form_{$form->owner->id}.getElementByName('{$form->name}').addGridRow(); return false;">{$form->NewLabel}</a></td>
</tr> </tr>
</table> </table>
{/if} {/if}
@@ -67,7 +66,6 @@
</table> </table>
</td></tr> </td></tr>
</table> </table>
</div> </div>
<div class="boxBottom"><div class="a"></div><div class="b"></div><div class="c"></div></div> <div class="boxBottom"><div class="a"></div><div class="b"></div><div class="c"></div></div>
</div> </div>

10
workflow/engine/xmlform/dynaforms/dynaforms_Properties.xml
View File

@@ -58,10 +58,9 @@
<en>Show print dynaform button</en> <en>Show print dynaform button</en>
</PRINTDYNAFORM> </PRINTDYNAFORM>
<ADJUSTGRIDSWITH type="checkbox" falseValue="0" value="0" defaultvalue="0" labelOnRight="0"> <ADJUSTGRIDSWIDTH type="checkbox" falseValue="0" value="0" defaultvalue="0" labelOnRight="0">
<en>Adjust the grid width to the width of the main form</en> <en>Adjust the grid width to the width of the main form</en>
</ADJUSTGRIDSWITH> </ADJUSTGRIDSWIDTH>
<!--<ENABLETEMPLATE type="checkbox" value="1" defaultvalue="0" labelOnRight="0"> <!--<ENABLETEMPLATE type="checkbox" value="1" defaultvalue="0" labelOnRight="0">
<en>Enable Template</en> <en>Enable Template</en>
</ENABLETEMPLATE>--> </ENABLETEMPLATE>-->
@@ -87,7 +86,7 @@ if(document.getElementById("form[DYN_TYPE]").value=="grid"){
hideRowById('WIDTH'); hideRowById('WIDTH');
hideRowById('NEXTSTEPSAVE'); hideRowById('NEXTSTEPSAVE');
hideRowById('PRINTDYNAFORM'); hideRowById('PRINTDYNAFORM');
hideRowById('ADJUSTGRIDSWITH'); hideRowById('ADJUSTGRIDSWIDTH');
} }
function getElementsByClassNameCrossBrowser(searchClass,node,tag) { function getElementsByClassNameCrossBrowser(searchClass,node,tag) {
@@ -124,6 +123,7 @@ leimnud.event.add(getField('DYN_TYPE'), 'change', function() {
showRowById('WIDTH'); showRowById('WIDTH');
showRowById('NEXTSTEPSAVE'); showRowById('NEXTSTEPSAVE');
showRowById('PRINTDYNAFORM'); showRowById('PRINTDYNAFORM');
showRowById('ADJUSTGRIDSWIDTH');
} }
}); });
@@ -150,7 +150,7 @@ function validateGridConversion(proUid,dynUid){
hideRowById('WIDTH'); hideRowById('WIDTH');
hideRowById('NEXTSTEPSAVE'); hideRowById('NEXTSTEPSAVE');
hideRowById('PRINTDYNAFORM'); hideRowById('PRINTDYNAFORM');
hideRowById('ADJUSTGRIDSWITH'); hideRowById('ADJUSTGRIDSWIDTH');
} else { } else {
setDropdownSelection("form[DYN_TYPE]" , "xmlform"); setDropdownSelection("form[DYN_TYPE]" , "xmlform");
msgBox("Grid forms can not contain the following fields: <br>" + response,"alert"); msgBox("Grid forms can not contain the following fields: <br>" + response,"alert");