|
| From: | Torstein |
| Subject: | [Fmsystem-commits] [10324] Controller. Changed url in create_case_message for setting url in ui-class to view |
| Date: | Wed, 24 Oct 2012 07:46:05 +0000 |
Revision: 10324
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10324
Author: vator
Date: 2012-10-24 07:46:04 +0000 (Wed, 24 Oct 2012)
Log Message:
-----------
Controller. Changed url in create_case_message for setting url in ui-class to
view
Modified Paths:
--------------
trunk/controller/inc/class.uicase.inc.php
trunk/controller/templates/base/case/create_case_message.xsl
Modified: trunk/controller/inc/class.uicase.inc.php
===================================================================
--- trunk/controller/inc/class.uicase.inc.php 2012-10-24 07:40:11 UTC (rev
10323)
+++ trunk/controller/inc/class.uicase.inc.php 2012-10-24 07:46:04 UTC (rev
10324)
@@ -220,33 +220,17 @@
$data = array
(
- 'categories' =>
$categories,
- 'check_list' =>
$check_list->toArray(),
- 'control'
=> $control->toArray(),
+ 'categories'
=> $categories,
+ 'check_list'
=> $check_list->toArray(),
+ 'control'
=> $control->toArray(),
'check_items_and_cases' =>
$check_items_and_cases,
- 'date_format' =>
$date_format,
- 'location_array' =>
$location_array,
- 'component_array' =>
$component_array,
+ 'location_array'
=> $location_array,
+ 'component_array'
=> $component_array,
'building_location_code' =>
$building_location_code,
- // 'current_year' =>
$year,
- // 'current_month_nr' =>
$month,
- 'type'
=> $type,
- 'location_level' =>
$level,
- 'url_calendar_for_year' =>
$GLOBALS['phpgw']->link('/index.php', array
-
(
-
'menuaction' => 'controller.uicalendar.view_calendar_for_year',
-
'year' => $year,
-
'location_code' => $type == 'component' ? $building_location_code :
$location_array['location_code']
-
)
-
),
- 'url_calendar_for_month' =>
$GLOBALS['phpgw']->link('/index.php', array
-
(
-
'menuaction' => 'controller.uicalendar.view_calendar_for_month',
-
'year' => $year,
-
'month' => $month,
-
'location_code' => $type == 'component' ? $building_location_code :
$location_array['location_code']
-
)
-
),
+ 'current_year'
=> $year,
+ 'current_month_nr'
=> $month,
+ 'type'
=> $type,
+ 'location_level'
=> $level,
);
if(count( $buildings_array ) > 0)
Modified: trunk/controller/templates/base/case/create_case_message.xsl
===================================================================
--- trunk/controller/templates/base/case/create_case_message.xsl
2012-10-24 07:40:11 UTC (rev 10323)
+++ trunk/controller/templates/base/case/create_case_message.xsl
2012-10-24 07:46:04 UTC (rev 10324)
@@ -24,10 +24,42 @@
</xsl:choose>
</div>
<div class="box-2 select-box">
- <a href="{url_calendar_for_year}">
- Kontrolplan for bygg/eiendom (år)
+
+ <a>
+ <xsl:attribute name="href">
+ <xsl:value-of
select="php:function('get_phpgw_link', '/index.php',
'menuaction:controller.uicalendar.view_calendar_for_year' )" />
+ <xsl:text>&year=</xsl:text>
+ <xsl:value-of select="current_year"/>
+ <xsl:text>&location_code=</xsl:text>
+ <xsl:choose>
+ <xsl:when test="type = 'component'">
+ <xsl:value-of
select="building_location_code"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of
select="location_array/location_code"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:attribute>
+ Kontrollplan for bygg/eiendom (år)
</a>
- <a class="last" href="{url_calendar_for_month}">
+
+ <a class="last">
+ <xsl:attribute name="href">
+ <xsl:value-of
select="php:function('get_phpgw_link', '/index.php',
'menuaction:controller.uicalendar.view_calendar_for_month' )" />
+ <xsl:text>&year=</xsl:text>
+ <xsl:value-of select="current_year"/>
+ <xsl:text>&month=</xsl:text>
+ <xsl:value-of
select="current_month_nr"/>
+ <xsl:text>&location_code=</xsl:text>
+ <xsl:choose>
+ <xsl:when test="type = 'component'">
+ <xsl:value-of
select="building_location_code"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of
select="location_array/location_code"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:attribute>
Kontrolplan for bygg/eiendom (måned)
</a>
</div>
| [Prev in Thread] | Current Thread | [Next in Thread] |