[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [10549] logistic: edit
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [10549] logistic: edit |
|
Date: |
Wed, 28 Nov 2012 12:18:37 +0000 |
Revision: 10549
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10549
Author: sigurdne
Date: 2012-11-28 12:18:37 +0000 (Wed, 28 Nov 2012)
Log Message:
-----------
logistic: edit
Modified Paths:
--------------
trunk/logistic/inc/class.uiactivity.inc.php
trunk/logistic/inc/model/class.activity.inc.php
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-28 11:20:02 UTC (rev
10548)
+++ trunk/logistic/inc/class.uiactivity.inc.php 2012-11-28 12:18:37 UTC (rev
10549)
@@ -410,13 +410,14 @@
{
$activity_id = phpgw::get_var('id');
$parent_activity_id = phpgw::get_var('parent_id',
'int');
- $project_id = phpgw::get_var('project_id');
+ $project_id = phpgw::get_var('project_id', 'int');
if($activity == null)
{
if( $activity_id && is_numeric($activity_id) )
{
$activity =
$this->so->get_single($activity_id);
+ $project_id =
$activity->get_project_id();
}
else
{
@@ -553,6 +554,7 @@
$activity->populate();
+//_debug_array($activity);die();
if( $activity->validate() )
{
$activity_id = $this->so->store($activity);
Modified: trunk/logistic/inc/model/class.activity.inc.php
===================================================================
--- trunk/logistic/inc/model/class.activity.inc.php 2012-11-28 11:20:02 UTC
(rev 10548)
+++ trunk/logistic/inc/model/class.activity.inc.php 2012-11-28 12:18:37 UTC
(rev 10549)
@@ -246,20 +246,21 @@
public function populate()
{
- $this->set_id( phpgw::get_var('id', 'int') );
+ $this->set_id( phpgw::get_var('id','POST', 'int') );
$this->set_name( phpgw::get_var('name') );
- $this->set_responsible_user_id(
phpgw::get_var('responsible_user_id', 'int') );
+ $this->set_responsible_user_id(
phpgw::get_var('responsible_user_id','POST', 'int') );
$this->set_description( phpgw::get_var('description') );
- if( $parent_id = phpgw::get_var('parent_activity_id',
'int') )
+ if( isset($_POST['parent_activity_id']))
{
- $this->set_parent_id( $parent_id );
+ $activity_id =
phpgw::get_var('parent_activity_id','POST', 'int');
+ $this->set_parent_id( $activity_id ?
$activity_id : '' );
}
else
{
- $this->set_parent_id(
phpgw::get_var('parent_id', 'int') );
+ $this->set_parent_id(
phpgw::get_var('parent_id','POST', 'int') );
}
- $this->set_project_id( phpgw::get_var('project_id',
'int') );
+ $this->set_project_id(
phpgw::get_var('project_id','POST', 'int') );
$user_id = $GLOBALS['phpgw_info']['user']['id'];
$this->set_update_user( $user_id );
@@ -268,15 +269,15 @@
$this->set_create_user( $user_id );
}
- if(phpgw::get_var('start_date','string') != '')
+ if(phpgw::get_var('start_date','POST','string') != '')
{
- $start_date_ts =
phpgwapi_datetime::date_to_timestamp( phpgw::get_var('start_date','string') );
+ $start_date_ts =
phpgwapi_datetime::date_to_timestamp(
phpgw::get_var('start_date','POST','string') );
$this->set_start_date($start_date_ts);
}
- if( phpgw::get_var('end_date','string') != '')
+ if( phpgw::get_var('end_date','POST','string') != '')
{
- $end_date_ts =
phpgwapi_datetime::date_to_timestamp( phpgw::get_var('end_date','string') );
+ $end_date_ts =
phpgwapi_datetime::date_to_timestamp(
phpgw::get_var('end_date','POST','string') );
$this->set_end_date($end_date_ts);
}
}
Modified: trunk/logistic/templates/base/activity/add_activity_item.xsl
===================================================================
--- trunk/logistic/templates/base/activity/add_activity_item.xsl
2012-11-28 11:20:02 UTC (rev 10548)
+++ trunk/logistic/templates/base/activity/add_activity_item.xsl
2012-11-28 12:18:37 UTC (rev 10549)
@@ -23,6 +23,13 @@
</h1>
</xsl:otherwise>
</xsl:choose>
+
+
+ <xsl:choose>
+ <xsl:when test="breadcrumb != ''">
+ <xsl:call-template name="breadcrumb" />
+ </xsl:when>
+ </xsl:choose>
<div id="activity_details" class="content-wrp">
<div id="details">
@@ -43,7 +50,7 @@
<div
style="margin-bottom: 1em;">
<label style="display:block;"><xsl:value-of select="php:function('lang',
'Choose another main activity for this sub activity')" /></label>
<select id="select_parent_activity" name="parent_activity_id">
-
<option value="">Velg annen hovedaktivitet</option>
+
<option value="0">Velg annen hovedaktivitet</option>
<xsl:for-each select="activities">
<option
value="{id}">
<xsl:if test="id = $parent_id">
@@ -78,28 +85,30 @@
</div>
</dt>
</xsl:when>-->
- <xsl:otherwise>
- <dt>
+ </xsl:choose>
+ <xsl:choose>
+ <xsl:when
test="projects != ''">
+ <dt>
<div
style="margin-bottom: 1em;">
<label style="display:block;"><xsl:value-of select="php:function('lang',
'Choose another project for the activity')" /></label>
<select id="select_project" name="select_project"
formvalidator:FormField="yes"
formvalidator:Type="SelectField">
<option value=''><xsl:value-of select="php:function('lang', 'Choose
another project')" /></option>
-
<xsl:for-each select="projects">
- <option
value="{id}">
-
<xsl:if test="project/id = project_id">
-
<xsl:attribute name="selected">
-
selected
-
</xsl:attribute>
-
</xsl:if>
-
<xsl:value-of disable-output-escaping="yes" select="name"/>
-
</option>
-
</xsl:for-each>
+
<xsl:for-each select="projects">
+
<option value="{id}">
+
<xsl:if test="project/id = project_id">
+
<xsl:attribute name="selected">
+
selected
+
</xsl:attribute>
+
</xsl:if>
+
<xsl:value-of disable-output-escaping="yes"
select="name"/>
+
</option>
+
</xsl:for-each>
</select>
</div>
</dt>
- </xsl:otherwise>
+ </xsl:when>
</xsl:choose>
<dt>
<label for="name"><xsl:value-of
select="php:function('lang','Activity name')" /></label>
@@ -264,3 +273,27 @@
<xsl:value-of disable-output-escaping="yes" select="name"/>
</option>
</xsl:template>
+
+<!-- =========== BREADCRUMB TEMPLATE ============== -->
+<xsl:template name="breadcrumb">
+ <div id="breadcrumb">
+ <span class="intro">Du er her:</span>
+ <xsl:for-each select="breadcrumb">
+ <xsl:choose>
+ <xsl:when test="current = 1">
+ <span class="current">
+ <xsl:value-of select="name"/>
+ </span>
+ </xsl:when>
+ <xsl:otherwise>
+ <a href="{link}">
+ <xsl:value-of select="name"/>
+ </a>
+ </xsl:otherwise>
+ </xsl:choose>
+ <xsl:if test="not( position() = last() )">
+ <img src="logistic/images/arrow_right.png" />
+ </xsl:if>
+ </xsl:for-each>
+ </div>
+</xsl:template>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [10549] logistic: edit,
Sigurd Nes <=