[Fmsystem-commits] [6570] merge 6568:6569 from trunk

[Sigurd Nes]

Revision: 6570
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6570
Author:   sigurdne
Date:     2010-11-10 10:40:17 +0000 (Wed, 10 Nov 2010)
Log Message:
-----------
merge 6568:6569 from trunk

Modified Paths:
--------------
    branches/Version-1_0-branch/frontend/inc/class.uihelpdesk.inc.php

Property Changed:
----------------
    branches/Version-1_0-branch/


Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567
   + 
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569

Modified: branches/Version-1_0-branch/frontend/inc/class.uihelpdesk.inc.php
===================================================================
--- branches/Version-1_0-branch/frontend/inc/class.uihelpdesk.inc.php   
2010-11-10 10:37:41 UTC (rev 6569)
+++ branches/Version-1_0-branch/frontend/inc/class.uihelpdesk.inc.php   
2010-11-10 10:40:17 UTC (rev 6570)
@@ -538,7 +538,6 @@
                                        // Read default assign-to-group from 
config
                                        $config = 
CreateObject('phpgwapi.config', 'frontend');
                                        $config->read();
-                                       $default_group = 
$config->config_data['tts_default_group'];
                                        $default_cat = 
$config->config_data['tts_default_cat'] ? 
$config->config_data['tts_default_cat'] : 0;
                                        
                                        if(!$default_cat)
@@ -553,12 +552,23 @@
                                                'loc2'  => 
$location_details['loc2']
                                        );
 
+                                       $assignedto = 
execMethod('property.boresponsible.get_responsible', array('location' => 
$location, 'cat_id' => $default_cat));
+
+                                       if(!$assignedto)
+                                       {
+                                               $default_group = 
$config->config_data['tts_default_group'];
+                                       }
+                                       else
+                                       {
+                                               $default_group = 0;
+                                       }
+
                                        $ticket = array(
                                                'origin'    => null,
                                                'origin_id' => null,
                                                'cat_id'    => $default_cat,
                                                'group_id'  => ($default_group 
? $default_group : null),
-                                               'assignedto'=> 
execMethod('property.boresponsible.get_responsible', array('location' => 
$location, 'cat_id' => $default_cat)),
+                                               'assignedto'=> $assignedto,
                                                'priority'  => 3,
                                                'status'    => 'O', // O = Open
                                                'subject'   => $values['title'],