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

BUG 6829 Adjust in dropdown&listbox for SQL queries with a default value blank

Browse Source
This commit is contained in:
Hector Cortez
2011-05-09 15:50:03 -04:00
parent b8019eecfd
commit ead22a80e6
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/methods/dynaforms/fields_Edit.php
View File

@@ -138,7 +138,7 @@ if (($RBAC_Response=$RBAC->userCanAccess("PM_FACTORY"))!=1) return $RBAC_Respons
if (isset($form->fields[$fields->Fields['XMLNODE_NAME']]->code)) $Fields['PME_CODE'] = $form->fields[$fields->Fields['XMLNODE_NAME']]->code; if (isset($form->fields[$fields->Fields['XMLNODE_NAME']]->code)) $Fields['PME_CODE'] = $form->fields[$fields->Fields['XMLNODE_NAME']]->code;
$options=isset($form->fields[$fields->Fields['XMLNODE_NAME']]->option)? $options=isset($form->fields[$fields->Fields['XMLNODE_NAME']]->option)?
$form->fields[$fields->Fields['XMLNODE_NAME']]->option:array(); $form->fields[$fields->Fields['XMLNODE_NAME']]->option:array();
if (!is_array($options)) $options =array(); if (!is_array($options) || count($options)==0) $options =array('' => '');
$Fields['PME_OPTIONS'] = array( $Fields['PME_OPTIONS'] = array(
'NAME' => array_keys($options), 'NAME' => array_keys($options),
'LABEL' => array_values($options) 'LABEL' => array_values($options)

11
workflow/engine/methods/dynaforms/fields_Save.php
View File

@@ -116,6 +116,15 @@ if (($RBAC_Response=$RBAC->userCanAccess("PM_FACTORY"))!=1) return $RBAC_Respons
$_POST['form']['PME_DELETEROW'] = '0'; $_POST['form']['PME_DELETEROW'] = '0';
} }
} }
if ($type==='dropdown' || $type==='listbox' ) {
if(isset($_POST['form']['PME_OPTIONS'][1])){
if($_POST['form']['PME_OPTIONS']['1']['NAME'] === "" &&
$_POST['form']['PME_OPTIONS']['1']['LABEL'] === ""){
unset($_POST['form']['PME_OPTIONS']);
}
}
}
} }
foreach($_POST['form'] as $key => $value){ foreach($_POST['form'] as $key => $value){
if (substr($key,0,4)==='PME_') if (substr($key,0,4)==='PME_')
@@ -214,7 +223,7 @@ if (($RBAC_Response=$RBAC->userCanAccess("PM_FACTORY"))!=1) return $RBAC_Respons
$_SESSION['_DBArray'] = $_DBArray; $_SESSION['_DBArray'] = $_DBArray;
// Additions to javascript // Additions to javascript
if($sType === 'javascript'){ if(isset($sType) && $sType === 'javascript'){
$sCode = $pmeCode; $sCode = $pmeCode;
$editor = new dynaformEditorAjax($_POST); $editor = new dynaformEditorAjax($_POST);
$editor->set_javascript($A, $fieldName, $sCode); $editor->set_javascript($A, $fieldName, $sCode);