[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [7557] bkbooking: bugfix on application and listings
From: |
Kjell Arne Espedal |
Subject: |
[Fmsystem-commits] [7557] bkbooking: bugfix on application and listings |
Date: |
Mon, 05 Sep 2011 13:57:44 +0000 |
Revision: 7557
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7557
Author: kjell
Date: 2011-09-05 13:57:43 +0000 (Mon, 05 Sep 2011)
Log Message:
-----------
bkbooking: bugfix on application and listings
Modified Paths:
--------------
trunk/booking/inc/class.uiapplication.inc.php
trunk/booking/templates/base/datatable.xsl
Modified: trunk/booking/inc/class.uiapplication.inc.php
===================================================================
--- trunk/booking/inc/class.uiapplication.inc.php 2011-09-05 09:38:52 UTC
(rev 7556)
+++ trunk/booking/inc/class.uiapplication.inc.php 2011-09-05 13:57:43 UTC
(rev 7557)
@@ -278,7 +278,7 @@
} else {
if (phpgw::get_var('status') == 'none')
{
- $filters['status'] = array('NEW',
'PENDING','REJECTED', 'ACCEPTED');
+ $filters['status'] = array('NEW',
'PENDING', 'REJECTED', 'ACCEPTED');
}
else
{
@@ -311,6 +311,12 @@
foreach($applications['results'] as &$application)
{
+ if (strstr($application['building_name'],"%")){
+ $search = array('%2C','%C3%85',
'%C3%A5', '%C3%98', '%C3%B8', '%C3%86', '%C3%A6');
+ $replace = array
(',','Å','å','Ø','ø','Æ','æ');
+ $application['building_name'] =
str_replace($search, $replace, $application['building_name']);
+ }
+
$application['status'] =
lang($application['status']);
$application['created'] =
pretty_timestamp($application['created']);
$application['modified'] =
pretty_timestamp($application['modified']);
Modified: trunk/booking/templates/base/datatable.xsl
===================================================================
--- trunk/booking/templates/base/datatable.xsl 2011-09-05 09:38:52 UTC (rev
7556)
+++ trunk/booking/templates/base/datatable.xsl 2011-09-05 13:57:43 UTC (rev
7557)
@@ -115,7 +115,16 @@
<select name="{$name}"
onMouseout="window.status='';return true;">
<xsl:for-each select="list">
<xsl:variable name="id"><xsl:value-of
select="id"/></xsl:variable>
- <option value="{$id}"><xsl:value-of
select="name"/></option>
+ <xsl:if test="id =
'NEW'">
+ <option value="{$id}"
selected="selected">
+
<xsl:value-of select="name"/>
+ </option>
+ </xsl:if>
+ <xsl:if test="id !=
'NEW'">
+ <option value="{$id}">
+
<xsl:value-of select="name"/>
+ </option>
+ </xsl:if>
</xsl:for-each>
</select>
</td>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [7557] bkbooking: bugfix on application and listings,
Kjell Arne Espedal <=