[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: admin/inc class.uicategories.inc.php,1.34,1.35
From: |
Bettina Gille <address@hidden> |
Subject: |
[Phpgroupware-cvs] CVS: admin/inc class.uicategories.inc.php,1.34,1.35 |
Date: |
Sun, 27 Apr 2003 20:31:17 -0400 |
Update of /cvsroot/phpgroupware/admin/inc
In directory subversions:/tmp/cvs-serv18821/inc
Modified Files:
class.uicategories.inc.php
Log Message:
update
Index: class.uicategories.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.uicategories.inc.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** class.uicategories.inc.php 27 Apr 2003 23:16:15 -0000 1.34
--- class.uicategories.inc.php 28 Apr 2003 00:31:14 -0000 1.35
***************
*** 101,105 ****
if ($_POST['done'])
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction=admin.iumainscreen.mainscreen');
}
--- 101,105 ----
if ($_POST['done'])
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction=admin.uimainscreen.mainscreen');
}
***************
*** 370,374 ****
);
! if ($_POST['cancel'] || !$this->cat_id)
{
$GLOBALS['phpgw']->redirect_link('/index.php',$link_data);
--- 370,374 ----
);
! if ($_POST['done'] || $_POST['cancel'] ||
!$this->cat_id)
{
$GLOBALS['phpgw']->redirect_link('/index.php',$link_data);
***************
*** 390,394 ****
break;
default:
! $error_msg =
lang('Please choose one of the methods to handle the subcategories');
break;
}
--- 390,396 ----
break;
default:
! $error
= array('Please choose one of the methods to handle the subcategories');
! $msgbox_error =
$GLOBALS['phpgw']->common->error_list($error);
! $show_done
= 'yes';
break;
}
***************
*** 412,421 ****
if ($apps_cats)
{
! $lang_confirm_msg = lang('This category is
currently being used by applications as a parent category. ')
! .
lang('You will need to reassign these subcategories before you can delete this
category');
}
else
{
! $lang_confirm_msg = lang('Are you sure you want
to delete this global category ?');
$exists = $this->bo->exists(array
--- 414,425 ----
if ($apps_cats)
{
! $error = array('This category is currently
being used by applications as a parent category',
! 'You will need
to reassign these subcategories before you can delete this category');
!
! $msgbox_error =
$GLOBALS['phpgw']->common->error_list($error);
}
else
{
! $confirm_msg = lang('Are you sure you want to
delete this global category ?');
$exists = $this->bo->exists(array
***************
*** 436,440 ****
$data = array
(
! 'lang_delete_msg' =>
$lang_confirm_msg,
'lang_delete' =>
lang('delete'),
'subs'
=> $subs,
--- 440,445 ----
$data = array
(
! 'show_done'
=> $show_done,
! 'msgbox_data' =>
$msgbox_error,
'lang_delete' =>
lang('delete'),
'subs'
=> $subs,
***************
*** 443,448 ****
'lang_delete_statustext' => lang('delete
the category'),
'lang_cancel_statustext' => lang('do NOT
delete the category and return back to the list'),
'lang_cancel' =>
lang('cancel'),
! 'lang_error_msg' =>
$error_msg
);
--- 448,455 ----
'lang_delete_statustext' => lang('delete
the category'),
'lang_cancel_statustext' => lang('do NOT
delete the category and return back to the list'),
+ 'lang_done_statustext' => lang('back
to the list'),
'lang_cancel' =>
lang('cancel'),
! 'lang_done'
=> lang('done'),
! 'lang_confirm_msg' =>
$confirm_msg
);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: admin/inc class.uicategories.inc.php,1.34,1.35,
Bettina Gille <address@hidden> <=