[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] admin/inc class.ui_custom_fields2.inc.php class...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] admin/inc class.ui_custom_fields2.inc.php class... |
|
Date: |
Mon, 27 Mar 2006 08:09:44 +0000 |
CVSROOT: /sources/phpgroupware
Module name: admin
Branch:
Changes by: Sigurd Nes <address@hidden> 06/03/27 08:09:44
Modified files:
inc : class.ui_custom_fields2.inc.php
class.bo_custom_fields2.inc.php
Log message:
fix redirect after delete
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/admin/inc/class.ui_custom_fields2.inc.php.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/admin/inc/class.bo_custom_fields2.inc.php.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
Patches:
Index: admin/inc/class.bo_custom_fields2.inc.php
diff -u admin/inc/class.bo_custom_fields2.inc.php:1.1
admin/inc/class.bo_custom_fields2.inc.php:1.2
--- admin/inc/class.bo_custom_fields2.inc.php:1.1 Sun Mar 26 20:00:56 2006
+++ admin/inc/class.bo_custom_fields2.inc.php Mon Mar 27 08:09:44 2006
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage admin
- * @version $Id: class.bo_custom_fields2.inc.php,v 1.1 2006/03/26
20:00:56 sigurdne Exp $
+ * @version $Id: class.bo_custom_fields2.inc.php,v 1.2 2006/03/27
08:09:44 sigurdne Exp $
*/
/**
@@ -140,13 +140,13 @@
- function
delete($location='',$appname='',$attrib_id='',$status_id='',$acl_location='',$custom_function_id='')
+ function
delete($location='',$appname='',$attrib_id='',$acl_location='',$custom_function_id='')
{
- if(!$status_id && $attrib_id && $location && $appname
&& !$custom_function_id):
+ if($attrib_id && $location && $appname &&
!$custom_function_id):
{
$this->so->delete_attrib($location,$appname,$attrib_id);
}
- elseif(!$status_id && $custom_function_id &&
$acl_location):
+ elseif($custom_function_id && $acl_location):
{
$this->so->delete_custom_function($acl_location,$custom_function_id);
}
Index: admin/inc/class.ui_custom_fields2.inc.php
diff -u admin/inc/class.ui_custom_fields2.inc.php:1.1
admin/inc/class.ui_custom_fields2.inc.php:1.2
--- admin/inc/class.ui_custom_fields2.inc.php:1.1 Sun Mar 26 20:00:56 2006
+++ admin/inc/class.ui_custom_fields2.inc.php Mon Mar 27 08:09:44 2006
@@ -10,7 +10,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage admin
- * @version $Id: class.ui_custom_fields2.inc.php,v 1.1 2006/03/26
20:00:56 sigurdne Exp $
+ * @version $Id: class.ui_custom_fields2.inc.php,v 1.2 2006/03/27
08:09:44 sigurdne Exp $
*/
/**
@@ -536,7 +536,7 @@
'lang_category'
=> lang('category'),
'category_name'
=> $category['name'],
'allow_allrows'
=> True,
- 'allrows'
=> $this->allrows,
+ 'allrows'
=> $this->allrows,
'start_record'
=> $this->start,
'record_limit'
=> $record_limit,
'start_record'
=> $this->start,
@@ -684,7 +684,6 @@
$appname =
get_var('appname',array('POST','GET'));
$location =
get_var('location',array('POST','GET'));
$attrib_id =
get_var('attrib_id',array('POST','GET'));
- $status_id =
get_var('status_id',array('POST','GET'));
$acl_location =
get_var('acl_location',array('POST','GET'));
$custom_function_id =
get_var('custom_function_id',array('POST','GET'));
$confirm = get_var('confirm',array('POST'));
@@ -699,38 +698,12 @@
}
endif;
- if (!$acl_location && $appname && $location)
- {
- $acl_location = '.entity.' . $appname . '.' .
$location;
- }
-
- if(!$function)
- {
- if($location)
- {
- if($status_id)
- {
- $function='list_status';
- }
- else
- {
- $function='category';
- }
- }
- else
- {
- $function='index';
- }
- }
-
-
$link_data = array
(
'menuaction' =>
$this->currentapp.'.ui_custom_fields2.'.$function,
'location' => $location,
'appname' => $appname,
- 'attrib_id' => $attrib_id,
- 'status_id' => $status_id
+ 'attrib_id' => $attrib_id
);
$delete_data = array
@@ -739,15 +712,14 @@
'location' => $location,
'appname' => $appname,
'attrib_id' => $attrib_id,
- 'status_id' => $status_id,
'acl_location' => $acl_location,
'custom_function_id' => $custom_function_id
);
if (get_var('confirm',array('POST')))
{
-
$this->bo->delete($location,$appname,$attrib_id,$status_id,$acl_location,$custom_function_id);
- Header('Location: ' .
$GLOBALS['phpgw']->link('/index.php',$link_data));
+
$this->bo->delete($location,$appname,$attrib_id,$acl_location,$custom_function_id);
+
$GLOBALS['phpgw']->redirect_link('/index.php',$link_data);
}
$GLOBALS['phpgw']->xslttpl->add_file(array('app_delete'));
@@ -757,13 +729,13 @@
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
'delete_action' =>
$GLOBALS['phpgw']->link('/index.php',$delete_data),
'lang_confirm_msg' => lang('do you
really want to delete this entry'),
- 'lang_yes' =>
lang('yes'),
+ 'lang_yes' => lang('yes'),
'lang_yes_standardtext' => lang('Delete the
entry'),
'lang_no_standardtext' => lang('Back to the
list'),
'lang_no' =>
lang('no')
);
- $appname
= lang('entity');
+ $appname
= lang('Custom fields');
$function_msg =
lang('delete entity type');
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
- [Phpgroupware-cvs] admin/inc class.ui_custom_fields2.inc.php class...,
Sigurd Nes <=