[Phpgroupware-cvs] tts/newticket.php, 1.31.2.3.4.3

[nomail]

Update of /tts
Modified Files:
        Branch: Version-0_9_16-branch
          newticket.php

date: 2004/04/16 11:30:05;  author: lpiepho;  state: Exp;  lines: +33 -8

Log Message:
General improvements and bugfixing
=====================================================================
No syntax errors detected in -
=====================================================================
Index: tts/newticket.php
diff -u tts/newticket.php:1.31.2.3.4.2 tts/newticket.php:1.31.2.3.4.3
--- tts/newticket.php:1.31.2.3.4.2      Tue Jan 20 05:03:42 2004
+++ tts/newticket.php   Fri Apr 16 11:30:05 2004
@@ -106,6 +106,8 @@
        if(!$submit)
        {
                $GLOBALS['phpgw']->preferences->read_repository();
+               
+               /*
                
if($GLOBALS['phpgw_info']['user']['preferences']['tts']['groupdefault'])
                {
                        
$entry_selected[$GLOBALS['phpgw_info']['user']['preferences']['tts']['groupdefault']]
 = ' selected';
@@ -120,7 +122,7 @@
                {
                        
$priority_selected[$GLOBALS['phpgw_info']['user']['preferences']['tts']['prioritydefault']]
 = ' selected';
                }
-
+               */
                $GLOBALS['phpgw']->template->set_file(array(
                        'newticket'   => 'newticket.tpl'
                ));
@@ -171,11 +173,18 @@
 
                while(list($key,$entry) = each($group_list))
                {
-                       $GLOBALS['phpgw']->template->set_var('optionname', 
$entry['account_name']);
-                       $GLOBALS['phpgw']->template->set_var('optionvalue', 
$entry['account_id']);
-                       $GLOBALS['phpgw']->template->set_var('optionselected', 
$tag);
-                       
$GLOBALS['phpgw']->template->parse('options_group','options_select',true);
+                       
if($GLOBALS['phpgw_info']['user']['preferences']['tts']['groupdefault'] == 
$entry['account_id'])
+                       {
+                               $selected = 'selected';
+                       }
+                       else
+                       {
+                               $selected = '';
+                       }
+                       $s .= '<option value="' . $entry['account_id'] . '" ' . 
$selected
+                               . '>' . $entry['account_name'] . '</option>';
                }
+               $GLOBALS['phpgw']->template->set_var('options_group',$s);
 
                $s = '<select name="ticket[category]">' . 
$GLOBALS['phpgw']->categories->formated_list('select','',$group,False) . 
'</select>';
                $GLOBALS['phpgw']->template->set_var('value_category',$s);
@@ -202,7 +211,15 @@
                $account_list = $accounts->get_list('accounts');
                while(list($key,$entry) = each($account_list))
                {
-                       $s .= '<option value="' . $entry['account_id'] . '" ' . 
$account_selected[$entry['account_lid']]
+                       
if($GLOBALS['phpgw_info']['user']['preferences']['tts']['assigntodefault'] == 
$entry['account_id'])
+                       {
+                               $account_selected = 'selected';
+                       }
+                       else
+                       {
+                               $account_selected = '';
+                       }
+                       $s .= '<option value="' . $entry['account_id'] . '" ' . 
$account_selected
                                . '>' . $entry['account_lid'] . '</option>';
                }
                
$GLOBALS['phpgw']->template->set_var('value_assignedto','<select 
name="ticket[assignedto]">' . $s . '</select>');
@@ -231,7 +248,15 @@
                $priority_comment[10] = ' - '.lang('Highest');
                for($i=1; $i<=10; $i++)
                {
-                       $priority_select .= '<option value="' . $i . '">' . $i 
. $priority_comment[$i] . '</option>';
+                       
if($GLOBALS['phpgw_info']['user']['preferences']['tts']['prioritydefault'] == 
$i)
+                       {
+                               $prio_selected = 'selected';
+                       }
+                       else
+                       {
+                               $prio_selected = '';
+                       }
+                       $priority_select .= '<option value="' . $i . '" ' . 
$prio_selected . '>' . $i . $priority_comment[$i] . '</option>';
                }
                $GLOBALS['phpgw']->template->set_var('value_priority','<select 
name="ticket[priority]">' . $priority_select . '</select>');