extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-07 05:50:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed bug with not saved description in preferences::add

Browse Source 
changed logic and look to apply with the style-guide
This commit is contained in:
Ralf Becker 2003-08-30 10:26:20 +00:00
parent 8ea71d2f7d
commit 3a4c803dbd
3 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
preferences/inc/class.uicategories.inc.php
View File

@ -70,7 +70,6 @@
$GLOBALS['phpgw']->template->set_var('user_name',$this->user); $GLOBALS['phpgw']->template->set_var('user_name',$this->user);
$GLOBALS['phpgw']->template->set_var('lang_search',lang('Search')); $GLOBALS['phpgw']->template->set_var('lang_search',lang('Search'));
$GLOBALS['phpgw']->template->set_var('lang_cancel',lang('Cancel')); $GLOBALS['phpgw']->template->set_var('lang_cancel',lang('Cancel'));
$GLOBALS['phpgw']->template->set_var('lang_done',lang('done'));
$GLOBALS['phpgw']->template->set_var('lang_sub',lang('Add sub')); $GLOBALS['phpgw']->template->set_var('lang_sub',lang('Add sub'));
$GLOBALS['phpgw']->template->set_var('lang_edit',lang('Edit')); $GLOBALS['phpgw']->template->set_var('lang_edit',lang('Edit'));
$GLOBALS['phpgw']->template->set_var('lang_delete',lang('Delete')); $GLOBALS['phpgw']->template->set_var('lang_delete',lang('Delete'));
@ -288,11 +287,6 @@
'cats_level' => $cats_level 'cats_level' => $cats_level
); );
$GLOBALS['phpgw_info']['flags']['app_header'] = lang('Add %1 category for',
$GLOBALS['phpgw_info']['apps'][$cats_app]['title']).': '.$this->user;
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
$new_parent = $_POST['new_parent']; $new_parent = $_POST['new_parent'];
$cat_parent = get_var('cat_parent',array('POST','GET')); $cat_parent = get_var('cat_parent',array('POST','GET'));
$cat_name = $_POST['cat_name']; $cat_name = $_POST['cat_name'];
@ -338,9 +332,14 @@
else else
{ {
$this->bo->save_cat($values); $this->bo->save_cat($values);
$GLOBALS['phpgw']->template->set_var('message',lang('Category %1 has been added !', $cat_name)); return $this->index();
//$GLOBALS['phpgw']->template->set_var('message',lang('Category %1 has been added !', $cat_name));
} }
} }
$GLOBALS['phpgw_info']['flags']['app_header'] = lang('Add %1 category for',
$GLOBALS['phpgw_info']['apps'][$cats_app]['title']).': '.$this->user;
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
$GLOBALS['phpgw']->template->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php',$link_data)); $GLOBALS['phpgw']->template->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php',$link_data));
@ -403,11 +402,6 @@
$GLOBALS['phpgw']->link_redirect('/index.php',$link_data); $GLOBALS['phpgw']->link_redirect('/index.php',$link_data);
} }
$GLOBALS['phpgw_info']['flags']['app_header'] = lang('Edit %1 category for',
$GLOBALS['phpgw_info']['apps'][$cats_app]['title']).': '.$this->user;
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
$new_parent = $_POST['new_parent']; $new_parent = $_POST['new_parent'];
$cat_parent = $_POST['cat_parent']; $cat_parent = $_POST['cat_parent'];
$cat_name = $_POST['cat_name']; $cat_name = $_POST['cat_name'];
@ -457,10 +451,16 @@
else else
{ {
$cat_id = $this->bo->save_cat($values); $cat_id = $this->bo->save_cat($values);
$GLOBALS['phpgw']->template->set_var('message',lang('Category %1 has been updated !',$cat_name)); return $this->index();
//$GLOBALS['phpgw']->template->set_var('message',lang('Category %1 has been updated !',$cat_name));
} }
} }
$GLOBALS['phpgw_info']['flags']['app_header'] = lang('Edit %1 category for',
$GLOBALS['phpgw_info']['apps'][$cats_app]['title']).': '.$this->user;
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
$cats = $this->bo->cats->return_single($cat_id); $cats = $this->bo->cats->return_single($cat_id);
$link_data['menuaction'] = 'preferences.uicategories.edit'; $link_data['menuaction'] = 'preferences.uicategories.edit';

4
preferences/templates/default/category_form.tpl
View File

@ -32,8 +32,8 @@
<!-- BEGIN add --> <!-- BEGIN add -->
<tr valign="bottom" height="50"> <tr valign="bottom" height="50">
<td colspan="2"><input type="submit" name="save" value="{lang_save}"></form></td> <td><input type="submit" name="save" value="{lang_save}"></form></td>
<td align="right"><form method="POST" action="{cancel_url}"> <td><form method="POST" action="{cancel_url}">
<input type="submit" name="cancel" value="{lang_cancel}"></form></td> <input type="submit" name="cancel" value="{lang_cancel}"></form></td>
</tr> </tr>
</table> </table>

5
preferences/templates/default/listcats.tpl
View File

@ -56,11 +56,12 @@
<input type="submit" value="{lang_add}"> <input type="submit" value="{lang_add}">
</form> </form>
</td> </td>
<td align="right"> <td>
<form method="POST" action="{doneurl}"> <form method="POST" action="{doneurl}">
<input type="submit" name="done" value="{lang_done}"> <input type="submit" name="done" value="{lang_cancel}">
</form> </form>
</td> </td>
<td width="80%">&nbsp;</td>
</tr> </tr>
</table> </table>