extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-29 19:33:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

update cats files to test new delete function

Browse Source
This commit is contained in:
ceb 2002-09-03 02:22:32 +00:00
parent b6ca89c43e
commit 8ad7b856f8
3 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/inc/class.bocategories.inc.php
View File

@ -142,9 +142,9 @@
} }
} }
function delete($cat_id,$subs=False) function delete($cat_id,$drop_subs=False,$modify_subs=True)
{ {
return $this->cats->delete($cat_id,$subs); $this->cats->delete($cat_id,$drop_subs,$modify_subs);
} }
function check_values($values) function check_values($values)

24
admin/inc/class.uicategories.inc.php
View File

@ -427,7 +427,11 @@
if ($GLOBALS['HTTP_POST_VARS']['confirm']) if ($GLOBALS['HTTP_POST_VARS']['confirm'])
{ {
if ($GLOBALS['HTTP_POST_VARS']['subs']) if ($GLOBALS['HTTP_POST_VARS']['modify_subs'])
{
$this->bo->delete($this->cat_id,False,True);
}
elseif ($GLOBALS['HTTP_POST_VARS']['drop_subs'])
{ {
$this->bo->delete($this->cat_id,True); $this->bo->delete($this->cat_id,True);
} }
@ -455,7 +459,7 @@
$hidden_vars = '<input type="hidden" name="cat_id" value="' . $this->cat_id . '">' . "\n"; $hidden_vars = '<input type="hidden" name="cat_id" value="' . $this->cat_id . '">' . "\n";
$GLOBALS['phpgw']->template->set_var('hidden_vars',$hidden_vars); $GLOBALS['phpgw']->template->set_var('hidden_vars',$hidden_vars);
if ($apps_cats) /*if ($apps_cats)
{ {
$GLOBALS['phpgw']->template->set_var('messages',lang('This category is currently being used by applications as a parent category') . '<br>' $GLOBALS['phpgw']->template->set_var('messages',lang('This category is currently being used by applications as a parent category') . '<br>'
. lang('You will need to remove the subcategories before you can delete this category')); . lang('You will need to remove the subcategories before you can delete this category'));
@ -469,7 +473,7 @@
$GLOBALS['phpgw']->template->pfp('donehandle','done'); $GLOBALS['phpgw']->template->pfp('donehandle','done');
} }
else else
{ {*/
$GLOBALS['phpgw']->template->set_var('messages',lang('Are you sure you want to delete this category ?')); $GLOBALS['phpgw']->template->set_var('messages',lang('Are you sure you want to delete this category ?'));
$exists = $this->bo->exists(array $exists = $this->bo->exists(array
@ -481,13 +485,11 @@
if ($exists) if ($exists)
{ {
$GLOBALS['phpgw']->template->set_var('lang_subs',lang('Do you also want to delete all global subcategories ?')); $GLOBALS['phpgw']->template->set_var('lang_drop_subs',lang('Do you also want to delete all global subcategories ?'));
$GLOBALS['phpgw']->template->set_var('subs','<input type="checkbox" name="subs" value="True">'); $GLOBALS['phpgw']->template->set_var('drop_subs','<input type="checkbox" name="drop_subs" value="True">');
}
else $GLOBALS['phpgw']->template->set_var('lang_modify_subs',lang('Do you want to move all global subcategories one level down ?'));
{ $GLOBALS['phpgw']->template->set_var('subs','<input type="checkbox" name="modify_subs" value="True">');
$GLOBALS['phpgw']->template->set_var('lang_subs','');
$GLOBALS['phpgw']->template->set_var('subs', '');
} }
$GLOBALS['phpgw']->template->set_var('nolink',$nolink); $GLOBALS['phpgw']->template->set_var('nolink',$nolink);
@ -499,7 +501,7 @@
$GLOBALS['phpgw']->template->set_var('lang_yes',lang('Yes')); $GLOBALS['phpgw']->template->set_var('lang_yes',lang('Yes'));
$GLOBALS['phpgw']->template->fp('phpgw_body','category_delete'); $GLOBALS['phpgw']->template->fp('phpgw_body','category_delete');
} //}
} }
} }
} }

8
admin/templates/default/delete_cat.tpl
View File

@ -8,8 +8,12 @@
<td align="center" colspan=2>{messages}</td> <td align="center" colspan=2>{messages}</td>
</tr> </tr>
<tr> <tr>
<td align="center">{lang_subs}</td> <td align="center">{lang_modify_subs}</td>
<td align="center">{subs}</td> <td align="center">{modify_subs}</td>
</tr>
<tr>
<td align="center">{lang_drop_subs}</td>
<td align="center">{drop_subs}</td>
</tr> </tr>
<tr> <tr>
<td align="center"> <td align="center">