|
| From: | Torstein |
| Subject: | [Fmsystem-commits] [10325] Controller: Changed url for view calendar for year and month to specifying the url in xsl |
| Date: | Wed, 24 Oct 2012 07:54:02 +0000 |
Revision: 10325
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10325
Author: vator
Date: 2012-10-24 07:54:01 +0000 (Wed, 24 Oct 2012)
Log Message:
-----------
Controller: Changed url for view calendar for year and month to specifying the
url in xsl
Modified Paths:
--------------
trunk/controller/inc/class.uicase.inc.php
trunk/controller/templates/base/case/create_case_message.xsl
trunk/controller/templates/base/case/view_case_message.xsl
Modified: trunk/controller/inc/class.uicase.inc.php
===================================================================
--- trunk/controller/inc/class.uicase.inc.php 2012-10-24 07:46:04 UTC (rev
10324)
+++ trunk/controller/inc/class.uicase.inc.php 2012-10-24 07:54:01 UTC (rev
10325)
@@ -395,45 +395,28 @@
$data = array
(
- 'control'
=> $control->toArray(),
- // 'message_ticket_id'
=> $message_ticket_id,
- 'message_ticket'
=> $message_ticket,
- 'category'
=> $category[0]['name'],
- 'location_array'
=> $location_array,
- 'component_array'
=> $component_array,
- 'control_array'
=> $control->toArray(),
- 'check_list'
=> $check_list->toArray(),
- 'check_items_and_cases' =>
$check_items_and_cases,
- // 'current_year'
=> $year,
- // 'current_month_nr'
=> $month,
- 'date_format'
=> $date_format,
- 'type'
=> $type,
- 'building_location_code' =>
$building_location_code,
- 'location_level'
=> $level,
- 'dateformat'
=> $GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
- 'url_calendar_for_year' =>
$GLOBALS['phpgw']->link('/index.php', array
+ 'control'
=> $control->toArray(),
+ //'message_ticket_id' =>
$message_ticket_id,
+ 'message_ticket'
=> $message_ticket,
+ 'category'
=> $category[0]['name'],
+ 'location_array'
=> $location_array,
+ 'component_array'
=> $component_array,
+ 'control_array'
=> $control->toArray(),
+ 'check_list'
=> $check_list->toArray(),
+ 'check_items_and_cases' =>
$check_items_and_cases,
+ 'current_year'
=> $year,
+ 'current_month_nr'
=> $month,
+ 'type'
=> $type,
+ 'building_location_code' =>
$building_location_code,
+ 'location_level'
=> $level,
+ 'url_ticket_view'
=> $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']
-
)
-
),
- 'url_ticket_view'
=> $GLOBALS['phpgw']->link('/index.php', array
-
(
'menuaction' => 'property.uitts.view',
'id' => $message_ticket_id
)
),
- 'url_ticket_new'
=> $GLOBALS['phpgw']->link('/index.php', array
+ 'url_ticket_new'
=> $GLOBALS['phpgw']->link('/index.php', array
(
'menuaction' => 'controller.uicase.create_case_message',
'check_list_id' => $check_list->get_id()
Modified: trunk/controller/templates/base/case/create_case_message.xsl
===================================================================
--- trunk/controller/templates/base/case/create_case_message.xsl
2012-10-24 07:46:04 UTC (rev 10324)
+++ trunk/controller/templates/base/case/create_case_message.xsl
2012-10-24 07:54:01 UTC (rev 10325)
@@ -24,8 +24,7 @@
</xsl:choose>
</div>
<div class="box-2 select-box">
-
- <a>
+ <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>
@@ -42,7 +41,7 @@
</xsl:attribute>
Kontrollplan for bygg/eiendom (år)
</a>
-
+
<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' )" />
Modified: trunk/controller/templates/base/case/view_case_message.xsl
===================================================================
--- trunk/controller/templates/base/case/view_case_message.xsl 2012-10-24
07:46:04 UTC (rev 10324)
+++ trunk/controller/templates/base/case/view_case_message.xsl 2012-10-24
07:54:01 UTC (rev 10325)
@@ -23,11 +23,43 @@
</xsl:otherwise>
</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] |