[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] hrm/inc hook_admin.inc.php, 1.2 class.uiuser.inc.php,
|
From: |
sigurdne |
|
Subject: |
[Phpgroupware-cvs] hrm/inc hook_admin.inc.php, 1.2 class.uiuser.inc.php, 1.3 class.uijob.inc.php, 1.3 class.uicategory.inc.php, 1.2 hook_help.inc.php, 1.2 hook_manual.inc.php, 1.2 hook_preferences.inc.php, 1.2 class.uiadmin.inc.php, 1.2 class.sojob.inc.php, 1.3 class.bojob.inc.php, 1.3 class.bocommon.inc.php, 1.2 class.bocategory.inc.php, 1.2 class.bouser.inc.php, 1.3 class.menu.inc.php, 1.2 class.socommon.inc.php, 1.2 class.socategory.inc.php, 1.2 class.soadmin.inc.php, 1.2 class.boadmin.inc.php, 1.2 |
|
Date: |
Mon, 21 Nov 2005 21:25:00 +0100 |
Update of hrm/inc
Modified Files:
Branch: MAIN
hook_admin.inc.php lines: +2 -3
class.uiuser.inc.php lines: +5 -6
class.uijob.inc.php lines: +5 -6
class.uicategory.inc.php lines: +2 -3
hook_help.inc.php lines: +1 -2
hook_manual.inc.php lines: +2 -2
hook_preferences.inc.php lines: +1 -3
class.uiadmin.inc.php lines: +2 -3
class.sojob.inc.php lines: +30 -3
class.bojob.inc.php lines: +4 -5
class.bocommon.inc.php lines: +2 -3
class.bocategory.inc.php lines: +2 -3
class.bouser.inc.php lines: +6 -7
class.menu.inc.php lines: +2 -3
class.socommon.inc.php lines: +2 -3
class.socategory.inc.php lines: +2 -3
class.soadmin.inc.php lines: +2 -3
class.boadmin.inc.php lines: +2 -3
Log Message:
no message
====================================================
Index: hrm/inc/hook_admin.inc.php
diff -u hrm/inc/hook_admin.inc.php:1.1 hrm/inc/hook_admin.inc.php:1.2
--- hrm/inc/hook_admin.inc.php:1.1 Mon Nov 21 12:01:20 2005
+++ hrm/inc/hook_admin.inc.php Mon Nov 21 20:25:33 2005
@@ -26,5 +26,4 @@
'Configure Access Permissions'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uiadmin.list_acl'),
);
display_section($appname,$appname,$file);
- }
-?>
\ No newline at end of file
+ }
\ No newline at end of file
====================================================
Index: hrm/inc/class.uiuser.inc.php
diff -u hrm/inc/class.uiuser.inc.php:1.2 hrm/inc/class.uiuser.inc.php:1.3
--- hrm/inc/class.uiuser.inc.php:1.2 Mon Nov 21 15:49:09 2005
+++ hrm/inc/class.uiuser.inc.php Mon Nov 21 20:25:33 2005
@@ -185,7 +185,7 @@
$receipt =
$GLOBALS['phpgw']->session->appsession('session_data','hrm_training_receipt');
$GLOBALS['phpgw']->session->appsession('session_data','hrm_training_receipt','');
-
+
$GLOBALS['phpgw']->xslttpl->add_file(array('user'));
@@ -289,11 +289,11 @@
if($entry['start_date'])
{
- $entry['start_date'] =
$GLOBALS['phpgw']->common->show_date($entry['start_date'],$dateformat);
+ $entry['start_date'] =
$GLOBALS['phpgw']->common->show_date($entry['start_date'],$dateformat);
}
if($entry['end_date'])
{
- $entry['end_date'] =
$GLOBALS['phpgw']->common->show_date($entry['end_date'],$dateformat);
+ $entry['end_date'] =
$GLOBALS['phpgw']->common->show_date($entry['end_date'],$dateformat);
}
$content[] = array
@@ -705,5 +705,4 @@
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('delete' => $data));
}
- }
-?>
+ }
\ No newline at end of file
====================================================
Index: hrm/inc/class.uijob.inc.php
diff -u hrm/inc/class.uijob.inc.php:1.2 hrm/inc/class.uijob.inc.php:1.3
--- hrm/inc/class.uijob.inc.php:1.2 Mon Nov 21 15:49:09 2005
+++ hrm/inc/class.uijob.inc.php Mon Nov 21 20:25:33 2005
@@ -87,7 +87,7 @@
$entry['name'] = $spaceset .
$entry['name'];
}
-
+
$content[] = array
(
'name' =>
$entry['name'],
@@ -237,7 +237,7 @@
$action='add';
}
-
+
if($parent_id)
{
$values['parent_id'] = $parent_id;
@@ -309,7 +309,7 @@
$receipt['error'][]=array('msg'=>lang('Please enter an integer !'));
unset($values['id']);
}
-
+
if($id)
{
$values['id']=$id;
@@ -319,7 +319,7 @@
{
$id = $values['id'];
}
-
+
if(!$receipt['error'])
{
$receipt =
$this->bo->save($values,$action,$type,$type_id);
@@ -427,4 +427,3 @@
}
}
-?>
====================================================
Index: hrm/inc/class.uicategory.inc.php
diff -u hrm/inc/class.uicategory.inc.php:1.1
hrm/inc/class.uicategory.inc.php:1.2
--- hrm/inc/class.uicategory.inc.php:1.1 Mon Nov 21 12:01:20 2005
+++ hrm/inc/class.uicategory.inc.php Mon Nov 21 20:25:33 2005
@@ -286,5 +286,4 @@
// $GLOBALS['phpgw']->xslttpl->pp();
}
- }
-?>
+ }
\ No newline at end of file
====================================================
Index: hrm/inc/hook_help.inc.php
diff -u hrm/inc/hook_help.inc.php:1.1 hrm/inc/hook_help.inc.php:1.2
--- hrm/inc/hook_help.inc.php:1.1 Mon Nov 21 12:01:20 2005
+++ hrm/inc/hook_help.inc.php Mon Nov 21 20:25:33 2005
@@ -44,4 +44,3 @@
);
$GLOBALS['phpgw']->help->draw();
-?>
====================================================
Index: hrm/inc/hook_manual.inc.php
diff -u hrm/inc/hook_manual.inc.php:1.1 hrm/inc/hook_manual.inc.php:1.2
--- hrm/inc/hook_manual.inc.php:1.1 Mon Nov 21 12:01:20 2005
+++ hrm/inc/hook_manual.inc.php Mon Nov 21 20:25:33 2005
@@ -24,4 +24,4 @@
);
//Do not modify below this line
display_manual_section($appname,$file);
-?>
+
====================================================
Index: hrm/inc/hook_preferences.inc.php
diff -u hrm/inc/hook_preferences.inc.php:1.1
hrm/inc/hook_preferences.inc.php:1.2
--- hrm/inc/hook_preferences.inc.php:1.1 Mon Nov 21 12:01:20 2005
+++ hrm/inc/hook_preferences.inc.php Mon Nov 21 20:25:33 2005
@@ -18,5 +18,3 @@
);
display_section($appname,$file);
-
-?>
====================================================
Index: hrm/inc/class.uiadmin.inc.php
diff -u hrm/inc/class.uiadmin.inc.php:1.1 hrm/inc/class.uiadmin.inc.php:1.2
--- hrm/inc/class.uiadmin.inc.php:1.1 Mon Nov 21 12:01:20 2005
+++ hrm/inc/class.uiadmin.inc.php Mon Nov 21 20:25:33 2005
@@ -616,5 +616,4 @@
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('contact_info' => $data));
$this->save_sessiondata();
}
- }
-?>
+ }
\ No newline at end of file
====================================================
Index: hrm/inc/class.sojob.inc.php
diff -u hrm/inc/class.sojob.inc.php:1.2 hrm/inc/class.sojob.inc.php:1.3
--- hrm/inc/class.sojob.inc.php:1.2 Mon Nov 21 15:49:09 2005
+++ hrm/inc/class.sojob.inc.php Mon Nov 21 20:25:33 2005
@@ -154,6 +154,34 @@
return $receipt;
}
+ function edit_job($values)
+ {
+
+ $this->db->transaction_begin();
+ $table = 'hrm_job';
+ if($values['parent_id'])
+ {
+ $this->db->query("SELECT job_level FROM $table
where id=" . intval($values['parent_id']),__LINE__,__FILE__);
+ $this->db->next_record();
+ $level = (int)$this->db->f('job_level') +1;
+ }
+
+ $value_set['descr'] =
$this->db->db_addslashes($values['descr']);
+ $value_set['name'] =
$this->db->db_addslashes($values['name']);
+ $value_set['job_parent'] =
$values['parent_id'];
+ $value_set['job_level'] = $level;
+
+ $value_set =
$this->bocommon->validate_db_update($value_set);
+
+ $this->db->query("UPDATE $table set $value_set WHERE
id=" . $values['id'],__LINE__,__FILE__);
+
+ $receipt['id'] = $values['id'];
+
+ $this->db->transaction_commit();
+
+ $receipt['message'][]=array('msg'=>lang('job has been
edited'));
+ return $receipt;
+ }
function edit($category,$type,$type_id)
{
@@ -190,5 +218,4 @@
return $job;
}
- }
-?>
+ }
\ No newline at end of file
====================================================
Index: hrm/inc/class.bojob.inc.php
diff -u hrm/inc/class.bojob.inc.php:1.2 hrm/inc/class.bojob.inc.php:1.3
--- hrm/inc/class.bojob.inc.php:1.2 Mon Nov 21 15:49:08 2005
+++ hrm/inc/class.bojob.inc.php Mon Nov 21 20:25:33 2005
@@ -169,7 +169,7 @@
{
$this->so->delete($id,$type,$type_id);
}
-
+
function select_job_list($selected='')
{
$jobs= $this->so->select_job_list();
@@ -200,6 +200,5 @@
return $job_list;
}
-
- }
-?>
+
+ }
\ No newline at end of file
====================================================
Index: hrm/inc/class.bocommon.inc.php
diff -u hrm/inc/class.bocommon.inc.php:1.1 hrm/inc/class.bocommon.inc.php:1.2
--- hrm/inc/class.bocommon.inc.php:1.1 Mon Nov 21 12:01:20 2005
+++ hrm/inc/class.bocommon.inc.php Mon Nov 21 20:25:33 2005
@@ -1377,5 +1377,4 @@
}
- }
-?>
+ }
\ No newline at end of file
====================================================
Index: hrm/inc/class.bocategory.inc.php
diff -u hrm/inc/class.bocategory.inc.php:1.1
hrm/inc/class.bocategory.inc.php:1.2
--- hrm/inc/class.bocategory.inc.php:1.1 Mon Nov 21 12:01:20 2005
+++ hrm/inc/class.bocategory.inc.php Mon Nov 21 20:25:33 2005
@@ -175,5 +175,4 @@
{
$this->so->delete($id,$type,$type_id);
}
- }
-?>
+ }
\ No newline at end of file
====================================================
Index: hrm/inc/class.bouser.inc.php
diff -u hrm/inc/class.bouser.inc.php:1.2 hrm/inc/class.bouser.inc.php:1.3
--- hrm/inc/class.bouser.inc.php:1.2 Mon Nov 21 15:49:09 2005
+++ hrm/inc/class.bouser.inc.php Mon Nov 21 20:25:33 2005
@@ -144,17 +144,17 @@
$dateformat =
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
if($values['start_date'])
{
- $values['start_date'] =
$GLOBALS['phpgw']->common->show_date($values['start_date'],$dateformat);
+ $values['start_date'] =
$GLOBALS['phpgw']->common->show_date($values['start_date'],$dateformat);
}
if($values['end_date'])
{
- $values['end_date'] =
$GLOBALS['phpgw']->common->show_date($values['end_date'],$dateformat);
+ $values['end_date'] =
$GLOBALS['phpgw']->common->show_date($values['end_date'],$dateformat);
}
if($values['entry_date'])
{
- $values['entry_date'] =
$GLOBALS['phpgw']->common->show_date($values['entry_date'],$dateformat);
+ $values['entry_date'] =
$GLOBALS['phpgw']->common->show_date($values['entry_date'],$dateformat);
}
-
+
return $values;
}
@@ -309,5 +309,4 @@
return $place_list;
}
- }
-?>
+ }
\ No newline at end of file
====================================================
Index: hrm/inc/class.menu.inc.php
diff -u hrm/inc/class.menu.inc.php:1.1 hrm/inc/class.menu.inc.php:1.2
--- hrm/inc/class.menu.inc.php:1.1 Mon Nov 21 12:01:20 2005
+++ hrm/inc/class.menu.inc.php Mon Nov 21 20:25:33 2005
@@ -79,5 +79,4 @@
return $menu;
}
- }
-?>
+ }
\ No newline at end of file
====================================================
Index: hrm/inc/class.socommon.inc.php
diff -u hrm/inc/class.socommon.inc.php:1.1 hrm/inc/class.socommon.inc.php:1.2
--- hrm/inc/class.socommon.inc.php:1.1 Mon Nov 21 12:01:20 2005
+++ hrm/inc/class.socommon.inc.php Mon Nov 21 20:25:33 2005
@@ -301,5 +301,4 @@
}
return $category_list;
}
- }
-?>
+ }
\ No newline at end of file
====================================================
Index: hrm/inc/class.socategory.inc.php
diff -u hrm/inc/class.socategory.inc.php:1.1
hrm/inc/class.socategory.inc.php:1.2
--- hrm/inc/class.socategory.inc.php:1.1 Mon Nov 21 12:01:20 2005
+++ hrm/inc/class.socategory.inc.php Mon Nov 21 20:25:33 2005
@@ -168,5 +168,4 @@
$this->db->query("DELETE FROM $table WHERE id='" . $id
. "'",__LINE__,__FILE__);
}
- }
-?>
+ }
\ No newline at end of file
====================================================
Index: hrm/inc/class.soadmin.inc.php
diff -u hrm/inc/class.soadmin.inc.php:1.1 hrm/inc/class.soadmin.inc.php:1.2
--- hrm/inc/class.soadmin.inc.php:1.1 Mon Nov 21 12:01:20 2005
+++ hrm/inc/class.soadmin.inc.php Mon Nov 21 20:25:33 2005
@@ -120,5 +120,4 @@
$this->db->query($sql,__LINE__,__FILE__);
}
}
- }
-?>
+ }
\ No newline at end of file
====================================================
Index: hrm/inc/class.boadmin.inc.php
diff -u hrm/inc/class.boadmin.inc.php:1.1 hrm/inc/class.boadmin.inc.php:1.2
--- hrm/inc/class.boadmin.inc.php:1.1 Mon Nov 21 12:01:19 2005
+++ hrm/inc/class.boadmin.inc.php Mon Nov 21 20:25:33 2005
@@ -501,5 +501,4 @@
return $this->so->edit_id($values);
}
- }
-?>
+ }
\ No newline at end of file
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] hrm/inc hook_admin.inc.php, 1.2 class.uiuser.inc.php, 1.3 class.uijob.inc.php, 1.3 class.uicategory.inc.php, 1.2 hook_help.inc.php, 1.2 hook_manual.inc.php, 1.2 hook_preferences.inc.php, 1.2 class.uiadmin.inc.php, 1.2 class.sojob.inc.php, 1.3 class.bojob.inc.php, 1.3 class.bocommon.inc.php, 1.2 class.bocategory.inc.php, 1.2 class.bouser.inc.php, 1.3 class.menu.inc.php, 1.2 class.socommon.inc.php, 1.2 class.socategory.inc.php, 1.2 class.soadmin.inc.php, 1.2 class.boadmin.inc.php, 1.2,
sigurdne <=