[Phpgroupware-cvs] hrm/inc class.uijob.inc.php, 1.15 class.sojob.inc.php, 1.14

[sigurdne]

Update of hrm/inc

Modified Files:
     Branch: MAIN
            class.uijob.inc.php lines: +4 -4
            class.sojob.inc.php lines: +21 -33

Log Message:
*** empty log message ***

====================================================
Index: hrm/inc/class.uijob.inc.php
diff -u hrm/inc/class.uijob.inc.php:1.14 hrm/inc/class.uijob.inc.php:1.15
--- hrm/inc/class.uijob.inc.php:1.14    Sat Dec  3 21:35:01 2005
+++ hrm/inc/class.uijob.inc.php Mon Dec  5 09:07:04 2005
@@ -354,8 +354,8 @@
                        $GLOBALS['phpgw_info']['flags']['noframework'] = True;
                        $GLOBALS['phpgw_info']['flags']['headonly']=true;

-                       $receipt = 
$GLOBALS['phpgw']->session->appsession('session_data','hrm_task_receipt');
-                       
$GLOBALS['phpgw']->session->appsession('session_data','hrm_task_receipt','');
+                       $receipt = 
$GLOBALS['phpgw']->session->appsession('session_data','hrm_task_tp_receipt');
+                       
$GLOBALS['phpgw']->session->appsession('session_data','hrm_task_tp_receipt','');

                        
$GLOBALS['phpgw']->xslttpl->add_file(array('job','nextmatchs','search_field'));

@@ -548,7 +548,7 @@

                                                if ($values['save'])
                                                {
-                                                       
$GLOBALS['phpgw']->session->appsession('session_data','hrm_task_type_receipt',$receipt);
+                                                       
$GLOBALS['phpgw']->session->appsession('session_data','hrm_task_tp_receipt',$receipt);
                                                        
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uijob.lookup_task&query='
 . $values['name']);
                                                }
                                        }

====================================================
Index: hrm/inc/class.sojob.inc.php
diff -u hrm/inc/class.sojob.inc.php:1.13 hrm/inc/class.sojob.inc.php:1.14
--- hrm/inc/class.sojob.inc.php:1.13    Fri Dec  2 22:40:13 2005
+++ hrm/inc/class.sojob.inc.php Mon Dec  5 09:07:04 2005
@@ -648,6 +648,26 @@
                }


+               function edit_task_type($values)
+               {
+                       $this->db->transaction_begin();
+
+                       $value_set['descr'] = 
$this->db->db_addslashes($values['descr']);
+                       $value_set['name'] = 
$this->db->db_addslashes($values['name']);
+
+                       $value_set      = 
$this->bocommon->validate_db_update($value_set);
+
+                       $this->db->query("UPDATE hrm_task_type set $value_set 
WHERE id=" . $values['task_type_id'],__LINE__,__FILE__);
+
+                       $this->db->transaction_commit();
+
+                       $receipt['message'][]=array('msg'=>lang('task type item 
has been edited'));
+
+                       $receipt['task_type_id']= $values['task_type_id'];
+                       return $receipt;
+               }
+
+
                function check_task_type($values)
                {
                        $sql = "SELECT * FROM  hrm_task_type WHERE id=" . 
intval($values['task_type_id']);
@@ -668,21 +688,6 @@
                {
                        $this->db->transaction_begin();

-/*
-                       if($values['task_type_id'])
-                       {
-                               if(!$this->check_task_type($values))
-                               {
-                                       unset($values['task_type_id']);
-                               }
-                       }
-                       if($values['name'] && !$values['task_type_id'])
-                       {
-                               $values['task_type_id'] = 
$this->add_task_type($values);
-                               $receipt['message'][]=array('msg'=>lang('task 
type item has been saved'));
-                       }
-
-*/
                        $task_id = $this->bocommon->next_id('hrm_task');

                        $insert_values=array(
@@ -725,26 +730,9 @@

                function edit_task($values)
                {
-                       $values['descr'] = 
$this->db->db_addslashes($values['descr']);
-                       $values['name'] = 
$this->db->db_addslashes($values['name']);

                        $this->db->transaction_begin();

-/*
-                       if($values['task_type_id'])
-                       {
-                               if(!$this->check_task_type($values))
-                               {
-                                       unset($values['task_type_id']);
-                               }
-                       }
-
-                       if($values['name'] && !$values['task_type_id'])
-                       {
-                               $values['task_type_id'] = 
$this->add_task_type($values);
-                               $receipt['message'][]=array('msg'=>lang('task 
type item has been saved'));
-                       }
-*/
                        $value_set['task_type_id']              = 
$values['task_type_id'];
                        $value_set['category']                  = 
$values['cat_id'];
                        $value_set['skill_id']                  = 
$values['skill_id'];