[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [10459]
From: |
Torstein |
Subject: |
[Fmsystem-commits] [10459] |
Date: |
Sun, 04 Nov 2012 22:34:57 +0000 |
Revision: 10459
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10459
Author: vator
Date: 2012-11-04 22:34:57 +0000 (Sun, 04 Nov 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/logistic/inc/class.uiactivity.inc.php
trunk/logistic/templates/base/activity/add_activity_item.xsl
trunk/logistic/templates/base/activity/view_activity_item.xsl
Modified: trunk/logistic/inc/class.uiactivity.inc.php
===================================================================
--- trunk/logistic/inc/class.uiactivity.inc.php 2012-11-04 21:13:41 UTC (rev
10458)
+++ trunk/logistic/inc/class.uiactivity.inc.php 2012-11-04 22:34:57 UTC (rev
10459)
@@ -268,6 +268,14 @@
switch ($query_type)
{
+ case 'children':
+ $activity_id =
phpgw::get_var('activity_id');
+ $filters = array('id' => $activity_id);
+ $result_objects =
$this->so->get($start_index, $num_of_objects, $sort_field, $sort_ascending,
$search_for, $search_type, $filters);
+ $object_count =
$this->so->get_count($search_for, $search_type, $filters);
+
+ array_shift($result_objects);
+ break;
case 'activity_id':
$activity_id =
phpgw::get_var('activity_id');
$filters = array('id' => $activity_id);
Modified: trunk/logistic/templates/base/activity/add_activity_item.xsl
===================================================================
--- trunk/logistic/templates/base/activity/add_activity_item.xsl
2012-11-04 21:13:41 UTC (rev 10458)
+++ trunk/logistic/templates/base/activity/add_activity_item.xsl
2012-11-04 22:34:57 UTC (rev 10459)
@@ -55,6 +55,26 @@
</div>
</dt>
</xsl:when>
+ <xsl:when test="(editable)
and not(parent_activity) and not(project)">
+ <dt>
+ <div
style="margin-bottom: 1em;">
+
<label style="display:block;">Velg prosjektet som aktiviteten er en del
av</label>
+
<select id="select_project" name="select_project">
+
<option>Velg prosjekt</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>
+
</select>
+ </div>
+ </dt>
+ </xsl:when>
<xsl:otherwise>
<dt>
<div
style="margin-bottom: 1em;">
Modified: trunk/logistic/templates/base/activity/view_activity_item.xsl
===================================================================
--- trunk/logistic/templates/base/activity/view_activity_item.xsl
2012-11-04 21:13:41 UTC (rev 10458)
+++ trunk/logistic/templates/base/activity/view_activity_item.xsl
2012-11-04 22:34:57 UTC (rev 10459)
@@ -204,7 +204,7 @@
var oArgs = {
menuaction:'logistic.uiactivity.index',
activity_id: '<xsl:value-of
select='activity/id'/>',
- type: 'activity_id',
+ type: 'children',
phpgw_return_as: 'json'
};
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [10459],
Torstein <=