X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=includes%2Fui%2Fui_input.inc;h=aa57475ccd8d474ec2d602140e285a6b259c283e;hb=9a1b3abd5371ad7f6315db1d56f8356587444314;hp=862032859bcbb9dd39784587da74a31335b2c7b7;hpb=1ea749c4abfe081bd7f1b4b11c65a61b311a189e;p=fa-stable.git
diff --git a/includes/ui/ui_input.inc b/includes/ui/ui_input.inc
index 86203285..aa57475c 100644
--- a/includes/ui/ui_input.inc
+++ b/includes/ui/ui_input.inc
@@ -37,6 +37,14 @@ function find_submit($prefix, $numeric=true)
}
return $numeric ? -1 : null;
}
+/*
+ Helper function.
+ Returns true if input $name with $submit_on_change option set is subject to update.
+*/
+function input_changed($name)
+{
+ return isset($_POST['_'.$name.'_changed']);
+}
//------------------------------------------------------------------------------
//
@@ -85,10 +93,16 @@ function input_num($postname=null, $dflt=0)
}
//---------------------------------------------------------------------------------
+//
+// Thanks to hidden fields buffering hidden() helper can be used in arbitrary places and
+// proper html structure is still preserved. Buffered hidden fields are output on the nearest
+// table or form closing tag (see output_hidden()).
+//
+$hidden_fields = array();
function hidden($name, $value=null, $echo=true)
{
- global $Ajax;
+ global $Ajax, $hidden_fields;
if ($value === null)
$value = get_post($name);
@@ -96,7 +110,7 @@ function hidden($name, $value=null, $echo=true)
$ret = "";
$Ajax->addUpdate($name, $name, $value);
if ($echo)
- echo $ret."\n";
+ $hidden_fields[] = $ret;
else
return $ret;
}
@@ -128,7 +142,7 @@ function submit($name, $value, $echo=true, $title=false, $atype=false, $icon=fal
} elseif (!is_bool($atype)) { // necessary: switch uses '=='
- $aspect = "aspect='$atype' ";
+ $aspect = " aspect='$atype' ";
$types = explode(' ', $atype);
foreach ($types as $type) {
@@ -156,7 +170,7 @@ function submit($name, $value, $echo=true, $title=false, $atype=false, $icon=fal
." name=\"$name\" id=\"$name\" value=\"$value\""
.($title ? " title='$title'" : '')
.">"
- .($icon ? "" : '')
+ .($icon ? "
" : '')
."$value"
."\n";
if ($echo)
@@ -188,6 +202,7 @@ function submit_center_last($name, $value, $title=false, $async=false, $icon=fal
/*
For following controls:
'both' - use both Ctrl-Enter and Escape hotkeys
+ 'upgrade' - use Ctrl-Enter with progress ajax indicator and Escape hotkeys. Nonajax request for OK option is performed.
'cancel' - apply to 'RESET' button
*/
function submit_add_or_update($add=true, $title=false, $async=false, $clone=false)
@@ -196,7 +211,10 @@ function submit_add_or_update($add=true, $title=false, $async=false, $clone=fals
if ($async === 'both') {
$async = 'default'; $cancel = 'cancel';
- }
+ }
+ elseif ($async === 'upgrade') {
+ $async = 'default nonajax process'; $cancel = 'cancel';
+ }
else if ($async === 'default')
$cancel = true;
else if ($async === 'cancel')
@@ -269,7 +287,7 @@ function set_icon($icon, $title=false)
global $path_to_root;
if (basename($icon) === $icon) // standard icons does not contain path separator
$icon = "$path_to_root/themes/".user_theme()."/images/$icon";
- return "
\n";
+ return "
\n";
}
function button($name, $value, $title=false, $icon=false, $aspect='')
@@ -291,7 +309,7 @@ function button($name, $value, $title=false, $icon=false, $aspect='')
."' value='1'" . ($title ? " title='$title'":" title='$value'")
. ($aspect ? " aspect='$aspect'" : '')
. $rel
- ." />".set_icon($icon)."\n";
+ ." >".set_icon($icon)."\n";
}
else
return "\n";
+ ." >\n";
}
function button_cell($name, $value, $title=false, $icon=false, $aspect='')
@@ -329,7 +347,7 @@ function select_button_cell($name, $value, $title=false)
function check_value($name)
{
- if (!isset($_POST[$name]))
+ if (!isset($_POST[$name]) || $_POST[$name]=='')
return 0;
return 1;
}
@@ -465,14 +483,14 @@ function qty_cell($label, $bold=false, $dec=null, $id=null)
label_cell(number_format2($label, $dec), "nowrap align=right", $id);
}
-function label_cells($label, $value, $params="", $params2="", $id='')
+function label_cells($label, $value, $params="", $params2="", $id=null)
{
if ($label != null)
echo "