[Fmsystem-commits] [12530] property: include inactive users for history

[Sigurd Nes]

Revision: 12530
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12530
Author:   sigurdne
Date:     2015-01-05 09:40:10 +0000 (Mon, 05 Jan 2015)
Log Message:
-----------
property: include inactive users for history

Modified Paths:
--------------
    trunk/property/inc/class.bocommon.inc.php
    trunk/property/templates/base/user_id_filter.xsl
    trunk/property/templates/base/user_id_select.xsl

Modified: trunk/property/inc/class.bocommon.inc.php
===================================================================
--- trunk/property/inc/class.bocommon.inc.php   2015-01-04 16:58:04 UTC (rev 
12529)
+++ trunk/property/inc/class.bocommon.inc.php   2015-01-05 09:40:10 UTC (rev 
12530)
@@ -478,30 +478,33 @@
 
                        $user_list = array();
 
-                       while (is_array($users) && list(,$user) = each($users))
+                       $selected_found = false;
+                       foreach ($users as $user)
                        {
                                $name = 
(isset($user['account_lastname'])?$user['account_lastname'].' 
':'').$user['account_firstname'];
-                               if ($user['account_id']==$selected)
+                               $user_list[] = array
+                               (
+                                       'id'            => $user['account_id'],
+                                       'name'          => $name,
+                                       'selected'      => $user['account_id'] 
== $selected ? 1 : 0
+                               );
+
+                               if(!$selected_found)
                                {
-                                       $user_list[] = array
-                                               (
-                                                       //'user_id'     => 
$user['account_id'],
-                                                       'id'    => 
$user['account_id'],
-                                                       'name'          => 
$name,
-                                                       'selected'      => 
'selected'
-                                               );
+                                       $selected_found = $user['account_id'] 
== $selected ? true : false;
                                }
-                               else
-                               {
-                                       $user_list[] = array
-                                               (
-                                                       //'user_id'     => 
$user['account_id'],
-                                                       'id'    => 
$user['account_id'],
-                                                       'name'          => $name
-                                               );
-                               }
                        }
 
+                       if($selected && !$selected_found)
+                       {
+                               $user_list[] = array
+                               (
+                                       'id'            => $selected,
+                                       'name'          => 
$GLOBALS['phpgw']->accounts->get($selected)->__toString(),
+                                       'selected'      => 1
+                               );
+                       }
+
                        return $user_list;
                }
 

Modified: trunk/property/templates/base/user_id_filter.xsl
===================================================================
--- trunk/property/templates/base/user_id_filter.xsl    2015-01-04 16:58:04 UTC 
(rev 12529)
+++ trunk/property/templates/base/user_id_filter.xsl    2015-01-05 09:40:10 UTC 
(rev 12530)
@@ -32,7 +32,7 @@
                        <xsl:value-of select="user_id"/>
                </xsl:variable>
                <xsl:choose>
-                       <xsl:when test="selected">
+                       <xsl:when test="selected = 1">
                                <option value="{$user_id}" selected="selected">
                                        <xsl:value-of 
disable-output-escaping="yes" select="name"/>
                                </option>

Modified: trunk/property/templates/base/user_id_select.xsl
===================================================================
--- trunk/property/templates/base/user_id_select.xsl    2015-01-04 16:58:04 UTC 
(rev 12529)
+++ trunk/property/templates/base/user_id_select.xsl    2015-01-05 09:40:10 UTC 
(rev 12530)
@@ -23,7 +23,7 @@
                        <xsl:value-of select="id"/>
                </xsl:variable>
                <xsl:choose>
-                       <xsl:when test="selected">
+                       <xsl:when test="selected = 1">
                                <option value="{$user_id}{$id}" 
selected="selected">
                                        <xsl:value-of 
disable-output-escaping="yes" select="name"/>
                                </option>