submit_js_confirm() fixed to be used on button loadable via ajax.

[fa-stable.git] / gl / manage / gl_account_types.php

diff --git a/gl/manage/gl_account_types.php b/gl/manage/gl_account_types.php
index 6fbb9df59a0c3c64a36f13d0d1d011df3baae3a1..3cef7a07540acdc4e051ae30c8c8665eae737ae3 100644 (file)
--- a/gl/manage/gl_account_types.php
+++ b/gl/manage/gl_account_types.php
@@ -24,22 +24,21 @@ simple_page_mode(false);
 
 function can_process() 
 {
-       global $selected_id;
-
-       /*if (!input_num('id'))
+       if (strlen(trim($_POST['id'])) == 0) 
        {
-           display_error( _("The account id must be an integer and cannot be empty."));
+           display_error( _("The account group id cannot be empty."));
            set_focus('id');
            return false;
-       }*/
-       if (strlen($_POST['name']) == 0) 
+       }
+       if (strlen(trim($_POST['name'])) == 0) 
        {
                display_error( _("The account group name cannot be empty."));
                set_focus('name');
                return false;
        }
 
-       if (isset($selected_id) && ($selected_id == $_POST['parent'])) 
+       //if (strcmp($_POST['id'], $_POST['parent']) == 0) 
+       if ($_POST['id'] === $_POST['parent']) 
        {
                display_error(_("You cannot set an account group to be a subgroup of itself."));
                return false;
@@ -65,9 +64,9 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
        {
                if (add_account_type($_POST['id'], $_POST['name'], $_POST['class_id'], $_POST['parent'])) {
                                display_notification(_('New account type has been added'));
-                               $Mode = 'RESET';
                        }
        }
+               $Mode = 'RESET';
        }
 }
 
@@ -119,7 +118,7 @@ if ($Mode == 'RESET')
 $result = get_account_types(check_value('show_inactive'));
 
 start_form();
-start_table($table_style);
+start_table(TABLESTYLE);
 $th = array(_("Group ID"), _("Group Name"), _("Subgroup Of"), _("Class Type"), "", "");
 inactive_control_column($th);
 table_header($th);
@@ -155,7 +154,7 @@ inactive_control_row($th);
 end_table(1);
 //-----------------------------------------------------------------------------------
 
-start_table($table_style2);
+start_table(TABLESTYLE2);
 
 if ($selected_id != "")
 {
@@ -170,10 +169,14 @@ if ($selected_id != "")
                if ($_POST['parent'] == '-1')
                        $_POST['parent'] == "";
                $_POST['class_id']  = $myrow["class_id"];
-               hidden('selected_id', $selected_id);
+               hidden('selected_id', $myrow['id']);
                hidden('old_id', $myrow["id"]);
        }
-       hidden('id');
+       else
+       {
+               hidden('selected_id', $selected_id);
+               hidden('old_id', $_POST["old_id"]);
+       }       
 }
 text_row_ex(_("ID:"), 'id', 10);
 text_row_ex(_("Name:"), 'name', 50);
@@ -184,7 +187,7 @@ class_list_row(_("Class Type:"), 'class_id', null);
 
 end_table(1);
 
-submit_add_or_update_center($selected_id == -1, '', 'both');
+submit_add_or_update_center($selected_id == "", '', 'both');
 
 end_form();