[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: preferences/inc class.uicategories.inc.php,1.2.2
|
From: |
Bettina Gille <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: preferences/inc class.uicategories.inc.php,1.2.2.5,1.2.2.6 |
|
Date: |
Fri, 04 Oct 2002 15:31:37 -0400 |
Update of /cvsroot/phpgroupware/preferences/inc
In directory subversions:/tmp/cvs-serv5738/inc
Modified Files:
Tag: Version-0_9_14-branch
class.uicategories.inc.php
Log Message:
fix for bug 1286
Index: class.uicategories.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/preferences/inc/class.uicategories.inc.php,v
retrieving revision 1.2.2.5
retrieving revision 1.2.2.6
diff -C2 -r1.2.2.5 -r1.2.2.6
*** class.uicategories.inc.php 24 Apr 2002 07:54:27 -0000 1.2.2.5
--- class.uicategories.inc.php 4 Oct 2002 19:31:35 -0000 1.2.2.6
***************
*** 381,398 ****
function edit()
{
! $cats_app = $GLOBALS['HTTP_GET_VARS']['cats_app'] ?
$GLOBALS['HTTP_GET_VARS']['cats_app'] : $GLOBALS['HTTP_POST_VARS']['cats_app'];
! $extra = $GLOBALS['HTTP_GET_VARS']['extra'] ?
$GLOBALS['HTTP_GET_VARS']['extra'] : $GLOBALS['HTTP_POST_VARS']['extra'];
! $global_cats = $GLOBALS['HTTP_GET_VARS']['global_cats']
? $GLOBALS['HTTP_GET_VARS']['global_cats'] :
$GLOBALS['HTTP_POST_VARS']['global_cats'];
! $cats_level = $GLOBALS['HTTP_GET_VARS']['cats_level']
? $GLOBALS['HTTP_GET_VARS']['cats_level'] :
$GLOBALS['HTTP_POST_VARS']['global_cats'];
! $cat_id = $GLOBALS['HTTP_GET_VARS']['cat_id'] ?
$GLOBALS['HTTP_GET_VARS']['cat_id'] : $GLOBALS['HTTP_POST_VARS']['cat_id'];
$link_data = array
(
! 'menuaction' =>
'preferences.uicategories.index',
! 'cats_app' => $cats_app,
! 'extra' => $extra,
! 'global_cats' => $global_cats,
! 'cats_level' => $cats_level,
! 'cat_id' => $cat_id
);
--- 381,398 ----
function edit()
{
! $cats_app =
$GLOBALS['HTTP_GET_VARS']['cats_app'] ? $GLOBALS['HTTP_GET_VARS']['cats_app'] :
$GLOBALS['HTTP_POST_VARS']['cats_app'];
! $extra =
$GLOBALS['HTTP_GET_VARS']['extra'] ? $GLOBALS['HTTP_GET_VARS']['extra'] :
$GLOBALS['HTTP_POST_VARS']['extra'];
! $global_cats =
$GLOBALS['HTTP_GET_VARS']['global_cats'] ?
$GLOBALS['HTTP_GET_VARS']['global_cats'] :
$GLOBALS['HTTP_POST_VARS']['global_cats'];
! $cats_level =
$GLOBALS['HTTP_GET_VARS']['cats_level'] ?
$GLOBALS['HTTP_GET_VARS']['cats_level'] :
$GLOBALS['HTTP_POST_VARS']['global_cats'];
! $cat_id =
$GLOBALS['HTTP_GET_VARS']['cat_id'] ? $GLOBALS['HTTP_GET_VARS']['cat_id'] :
$GLOBALS['HTTP_POST_VARS']['cat_id'];
$link_data = array
(
! 'menuaction' =>
'preferences.uicategories.index',
! 'cats_app' => $cats_app,
! 'extra' => $extra,
! 'global_cats' => $global_cats,
! 'cats_level' => $cats_level,
! 'cat_id' => $cat_id
);
***************
*** 405,415 ****
echo parse_navbar();
! $new_parent =
$GLOBALS['HTTP_POST_VARS']['new_parent'];
! $submit = $GLOBALS['HTTP_POST_VARS']['submit'];
! $cat_parent =
$GLOBALS['HTTP_POST_VARS']['cat_parent'];
! $cat_name =
$GLOBALS['HTTP_POST_VARS']['cat_name'];
! $cat_description =
$GLOBALS['HTTP_POST_VARS']['cat_description'];
! $cat_data =
$GLOBALS['HTTP_POST_VARS']['cat_data'];
! $cat_access =
$GLOBALS['HTTP_POST_VARS']['cat_access'];
$this->t->set_file(array('form' =>
'category_form.tpl'));
--- 405,416 ----
echo parse_navbar();
! $new_parent =
$GLOBALS['HTTP_POST_VARS']['new_parent'];
! $submit =
$GLOBALS['HTTP_POST_VARS']['submit'];
! $cat_parent =
$GLOBALS['HTTP_POST_VARS']['cat_parent'];
! $cat_name =
$GLOBALS['HTTP_POST_VARS']['cat_name'];
! $cat_description =
$GLOBALS['HTTP_POST_VARS']['cat_description'];
! $cat_data =
$GLOBALS['HTTP_POST_VARS']['cat_data'];
! $cat_access =
$GLOBALS['HTTP_POST_VARS']['cat_access'];
! $old_parent =
$GLOBALS['HTTP_POST_VARS']['old_parent'];
$this->t->set_file(array('form' =>
'category_form.tpl'));
***************
*** 438,447 ****
$values = array
(
! 'id' => $cat_id,
! 'parent' => $cat_parent,
! 'descr' => $cat_description,
! 'name' => $cat_name,
! 'access' => $cat_access,
! 'data' => $data
);
--- 439,449 ----
$values = array
(
! 'id' => $cat_id,
! 'parent' => $cat_parent,
! 'descr' =>
$cat_description,
! 'name' => $cat_name,
! 'access' => $cat_access,
! 'data' => $data,
! 'old_parent' => $old_parent
);
***************
*** 453,457 ****
else
{
! $this->bo->save_cat($values);
$this->t->set_var('message',lang('Category x has been updated !',$cat_name));
}
--- 455,459 ----
else
{
! $cat_id = $this->bo->save_cat($values);
$this->t->set_var('message',lang('Category x has been updated !',$cat_name));
}
***************
*** 467,470 ****
--- 469,474 ----
$this->t->set_var('cat_name',$GLOBALS['phpgw']->strip_html($cats[0]['name']));
$this->t->set_var('cat_description',$GLOBALS['phpgw']->strip_html($cats[0]['description']));
+
+ $this->template->set_var('hidden_vars','<input
type="hidden" name="old_parent" value="' . $cats[0]['parent'] . '">');
if ($cats_level)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: preferences/inc class.uicategories.inc.php,1.2.2.5,1.2.2.6,
Bettina Gille <address@hidden> <=