[Fmsystem-commits] [10453]

[Torstein]

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


Modified Paths:
--------------
    trunk/logistic/inc/class.uiactivity.inc.php
    trunk/logistic/setup/phpgw_no.lang
    trunk/logistic/templates/base/activity/add_activity_item.xsl

Modified: trunk/logistic/inc/class.uiactivity.inc.php
===================================================================
--- trunk/logistic/inc/class.uiactivity.inc.php 2012-11-04 13:35:56 UTC (rev 
10452)
+++ trunk/logistic/inc/class.uiactivity.inc.php 2012-11-04 14:04:15 UTC (rev 
10453)
@@ -366,6 +366,11 @@
                        
                        if($activity == null)
                        {
+                               if( $project_id && is_numeric($project_id) )
+                               {
+                                       $project = 
$this->so_project->get_single($project_id);
+                               }
+                               
                                if( $activity_id && is_numeric($activity_id) )
                                {
                                        $activity = 
$this->so->get_single($activity_id);
@@ -406,6 +411,11 @@
                                'breadcrumb' => $this->_get_breadcrumb( 
$activity_id, 'logistic.uiactivity.edit', 'id')
                        );
                        
+                       if($project)
+                       {
+                               $data['project'] = $project;
+                       }
+                       
                        if($parent_activity)
                        {
                                $data['parent_activity'] = $parent_activity;

Modified: trunk/logistic/setup/phpgw_no.lang
===================================================================
--- trunk/logistic/setup/phpgw_no.lang  2012-11-04 13:35:56 UTC (rev 10452)
+++ trunk/logistic/setup/phpgw_no.lang  2012-11-04 14:04:15 UTC (rev 10453)
@@ -87,4 +87,5 @@
 Overview for activity  logistic        no      Oversikt for aktiviten
 Edit activity  logistic        no      Endre aktivitet
 Add activity   logistic        no      Legg til aktivitet
-Overview of resources for activity     logistic        no      Oversikt over 
ressurser for aktivteten
\ No newline at end of file
+Overview of resources for activity     logistic        no      Oversikt over 
ressurser for aktivteten
+Add activity to project        logistic        no      Legg aktivitet til 
prosjektet
\ No newline at end of file

Modified: trunk/logistic/templates/base/activity/add_activity_item.xsl
===================================================================
--- trunk/logistic/templates/base/activity/add_activity_item.xsl        
2012-11-04 13:35:56 UTC (rev 10452)
+++ trunk/logistic/templates/base/activity/add_activity_item.xsl        
2012-11-04 14:04:15 UTC (rev 10453)
@@ -5,6 +5,12 @@
 <div class="yui-navset yui-navset-top">
 
        <xsl:choose>
+               <xsl:when test="project/id != '' or project/id != 0">
+                       <h1>
+                               <xsl:value-of select="php:function('lang', 'Add 
activity to project')" />
+                               <span style="margin-left:5px;"><xsl:value-of 
select="project/name" /></span>
+                       </h1>
+               </xsl:when>
                <xsl:when test="activity/id != '' or activity/id != 0">
                        <h1>
                                <xsl:value-of select="php:function('lang', 
'Edit activity')" />