[Fmsystem-commits] [10460]

[Torstein]

Revision: 10460
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10460
Author:   vator
Date:     2012-11-04 22:50:08 +0000 (Sun, 04 Nov 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/logistic/inc/class.uiactivity.inc.php
    trunk/logistic/inc/class.uirequirement_resource_allocation.inc.php
    trunk/logistic/templates/base/allocation/book_resources.xsl

Modified: trunk/logistic/inc/class.uiactivity.inc.php
===================================================================
--- trunk/logistic/inc/class.uiactivity.inc.php 2012-11-04 22:34:57 UTC (rev 
10459)
+++ trunk/logistic/inc/class.uiactivity.inc.php 2012-11-04 22:50:08 UTC (rev 
10460)
@@ -333,6 +333,12 @@
                                        
                                        $activity_arr['status'] = $status;
                                        
+                                       
+                                       $href = self::link(array('menuaction' 
=> 'logistic.uiactivity.view', 'id' => $activity_arr['id']));
+                                       $activity_arr['id'] = "<a 
href=\"{$href}\">" . $activity_arr['id'] . "</a>";
+                                       $activity_arr['name'] = "<a 
href=\"{$href}\">" . $activity_arr['name'] . "</a>";
+                                       
+                                       
                                        $rows[] = $activity_arr;
                                }
                        }
@@ -567,11 +573,11 @@
                                'datatable' => array(
                                        'source' => 
self::link(array('menuaction' => 'logistic.uirequirement.index', 'activity_id' 
=> $activity_id, 'phpgw_return_as' => 'json')),
                                        'field' => array(
-                                               array(
+                                               /*array(
                                                        'key' => 'select',
                                                        'label' => 
lang('select'),
                                                        'sortable' => false,
-                                               ),
+                                               ),*/
                                                array(
                                                        'key' => 'id',
                                                        'label' => lang('ID'),

Modified: trunk/logistic/inc/class.uirequirement_resource_allocation.inc.php
===================================================================
--- trunk/logistic/inc/class.uirequirement_resource_allocation.inc.php  
2012-11-04 22:34:57 UTC (rev 10459)
+++ trunk/logistic/inc/class.uirequirement_resource_allocation.inc.php  
2012-11-04 22:50:08 UTC (rev 10460)
@@ -408,7 +408,7 @@
                        }
                        else
                        {
-                               $GLOBALS['phpgw']->redirect_link('/index.php', 
array('menuaction' => 
'logistic.uirequirement_resource_allocation.view_resource_allocation', 
'requirement_id' => $requirement_id));
+                               $GLOBALS['phpgw']->redirect_link('/index.php', 
array('menuaction' => 'logistic.uiactivity.view_resource_allocation', 
'requirement_id' => $requirement_id));
                        }
                }
                

Modified: trunk/logistic/templates/base/allocation/book_resources.xsl
===================================================================
--- trunk/logistic/templates/base/allocation/book_resources.xsl 2012-11-04 
22:34:57 UTC (rev 10459)
+++ trunk/logistic/templates/base/allocation/book_resources.xsl 2012-11-04 
22:50:08 UTC (rev 10460)
@@ -7,6 +7,17 @@
                <xsl:value-of select="php:function('lang', 'Booking of 
resources')"/> for <xsl:value-of select="activity/name"/>
        </h1>
        
+       <xsl:variable name="view_resources_params">
+               
<xsl:text>menuaction:logistic.uiactivity.view_resource_allocation, 
activity_id:</xsl:text>
+                       <xsl:value-of select="activity/id" />
+               </xsl:variable>
+               <xsl:variable name="view_resources_url">
+                       <xsl:value-of select="php:function('get_phpgw_link', 
'/index.php', $view_resources_params )" />
+       </xsl:variable>
+       <a style="margin-left: 20px;" id="view-resources-btn" class="btn 
non-focus" href="{$view_resources_url}">
+               <xsl:value-of select="php:function('lang', 'View resources 
overview')" />
+       </a>
+       
        <div class="content-wrp">
                
                <div id="requirement-wrp">