[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [16702] Stable: Merge 16700:16701 from trunk
From: |
sigurdne |
Subject: |
[Fmsystem-commits] [16702] Stable: Merge 16700:16701 from trunk |
Date: |
Fri, 5 May 2017 10:28:04 -0400 (EDT) |
Revision: 16702
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16702
Author: sigurdne
Date: 2017-05-05 10:28:04 -0400 (Fri, 05 May 2017)
Log Message:
-----------
Stable: Merge 16700:16701 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/eventplanner/inc/model/class.application.inc.php
branches/Version-2_0-branch/helpdesk/inc/class.botts.inc.php
branches/Version-2_0-branch/helpdesk/inc/class.sotts.inc.php
branches/Version-2_0-branch/helpdesk/inc/class.uitts.inc.php
branches/Version-2_0-branch/helpdesk/inc/custom/default/ticket_LRS_pre_commit_validate.php
branches/Version-2_0-branch/helpdesk/setup/phpgw_no.lang
branches/Version-2_0-branch/helpdesk/setup/setup.inc.php
branches/Version-2_0-branch/helpdesk/setup/tables_current.inc.php
branches/Version-2_0-branch/helpdesk/setup/tables_update.inc.php
branches/Version-2_0-branch/helpdesk/templates/base/tts.xsl
Property Changed:
----------------
branches/Version-2_0-branch/
Index: branches/Version-2_0-branch
===================================================================
--- branches/Version-2_0-branch 2017-05-05 14:26:46 UTC (rev 16701)
+++ branches/Version-2_0-branch 2017-05-05 14:28:04 UTC (rev 16702)
Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
/branches/dev-syncromind:13653
/branches/dev-syncromind-2:14933-16587
/branches/stavangerkommune:12743-12875,12986
-/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046,16048-16051,16053,16055,16057-16063,16065-16071,16073-16077,16079-16081,16083-16099,16101-16130,16132-16140,16142,16144-16212,16214-16219,16221,16223-16224,16226,16228-16229,16231,16233,16235,16237,16239-16240,16242,16244-16246,16248,16250-16251,16253-16255,16257-16259,16261,16263,16265,16267,16269-16276,16278,16280-16283,16285,16287-16288,16290,16292-16295,16297-16305,16307-16314,16316-16318,16320-16322,16324,16326-16330,16332,16334,16336,16338-16339,16341-16342,16344,16346,16348,16350,16352-16353,16355-16358,16360,16362,16364-16369,16371,16373,16375-16378,16380,16382-16383,16385,16387,16389,16391,16393-16395,16397,16399-16402,16404,16406,16408,16410-16415,16417,16419-16420,16422-16425,16427,16429-16440,16442,16444,16446,16448-16449,16451,16453,16455-16463,16465-16472,16474-16475,16477-16484,16486,16488,16490-16497,16499,16501-16503,16505-16512,16514-16517,16519,16521,16523,16525,16527-16532,16534,16536-16541,16543,16545-16554,16556,16558-16565,16567-16575,16577-16584,16586-16588,16590,16592-16593,16595-16596,16598,16600-16601,16603-16608,16610-16614,16616-16618,16620-16621,16623-16624,16626,16628,16630,16632-16638,16640,16642,16644,16646-16651,16653-16663,16665,16667,16669,16671,16673,16675,16677,16679-16680,16682,16684,16686,16688-16692,16694-16695,16697-16699
\ No newline at end of property
+/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046,16048-16051,16053,16055,16057-16063,16065-16071,16073-16077,16079-16081,16083-16099,16101-16130,16132-16140,16142,16144-16212,16214-16219,16221,16223-16224,16226,16228-16229,16231,16233,16235,16237,16239-16240,16242,16244-16246,16248,16250-16251,16253-16255,16257-16259,16261,16263,16265,16267,16269-16276,16278,16280-16283,16285,16287-16288,16290,16292-16295,16297-16305,16307-16314,16316-16318,16320-16322,16324,16326-16330,16332,16334,16336,16338-16339,16341-16342,16344,16346,16348,16350,16352-16353,16355-16358,16360,16362,16364-16369,16371,16373,16375-16378,16380,16382-16383,16385,16387,16389,16391,16393-16395,16397,16399-16402,16404,16406,16408,16410-16415,16417,16419-16420,16422-16425,16427,16429-16440,16442,16444,16446,16448-16449,16451,16453,16455-16463,16465-16472,16474-16475,16477-16484,16486,16488,16490-16497,16499,16501-16503,16505-16512,16514-16517,16519,16521,16523,16525,16527-16532,16534,16536-16541,16543,16545-16554,16556,16558-16565,16567-16575,16577-16584,16586-16588,16590,16592-16593,16595-16596,16598,16600-16601,16603-16608,16610-16614,16616-16618,16620-16621,16623-16624,16626,16628,16630,16632-16638,16640,16642,16644,16646-16651,16653-16663,16665,16667,16669,16671,16673,16675,16677,16679-16680,16682,16684,16686,16688-16692,16694-16695,16697-16699,16701
\ No newline at end of property
Modified:
branches/Version-2_0-branch/eventplanner/inc/model/class.application.inc.php
===================================================================
---
branches/Version-2_0-branch/eventplanner/inc/model/class.application.inc.php
2017-05-05 14:26:46 UTC (rev 16701)
+++
branches/Version-2_0-branch/eventplanner/inc/model/class.application.inc.php
2017-05-05 14:28:04 UTC (rev 16702)
@@ -179,6 +179,7 @@
'type' => 'string',
'label' => 'application description',
'sortable' => false,
+ 'required' => true,
),
'summary' => array('action'=> PHPGW_ACL_ADD |
PHPGW_ACL_EDIT,
'type' => 'html',
@@ -234,7 +235,9 @@
),
'types' => array(
'action'=> PHPGW_ACL_ADD |
PHPGW_ACL_EDIT,
- 'type' => 'int', 'required' => true,
+ 'type' => 'int',
+ 'label' => 'program type',
+ 'required' => true,
'manytomany' => array(
'table' =>
'eventplanner_application_type_relation',
'key' => 'application_id',
Modified: branches/Version-2_0-branch/helpdesk/inc/class.botts.inc.php
===================================================================
--- branches/Version-2_0-branch/helpdesk/inc/class.botts.inc.php
2017-05-05 14:26:46 UTC (rev 16701)
+++ branches/Version-2_0-branch/helpdesk/inc/class.botts.inc.php
2017-05-05 14:28:04 UTC (rev 16702)
@@ -834,7 +834,18 @@
$body .= '<tr><td>'.
lang('Group').'</td><td>: '. $group_name ."</td></tr>";
}
- $body .= '<tr><td>'. lang('Opened
By').'</td><td>: '. $ticket['user_name'] ."</td></tr>";
+ if($ticket['reverse_id'])
+ {
+ $user_name = $ticket['reverse_name'];
+ $body .= '<tr><td>'. lang('Owned
By').'</td><td>: '. $ticket['user_name'] ."</td></tr>";
+ }
+ else
+ {
+ $user_name = $ticket['user_name'];
+ }
+
+ $body .= '<tr><td>'. lang('Opened
By').'</td><td>: '. $user_name ."</td></tr>";
+
if($timestampclosed)
{
$body .= '<tr><td>'. lang('Date
Closed').'</td><td>: '.$timestampclosed."</td></tr>";
@@ -886,9 +897,10 @@
</tr>
</thead>
HTML;
- $table_content .=
"<tr><td>{$i}</td><td>{$entry_date}</td><td>{$ticket['user_name']}</td><td>{$ticket['details']}</td></tr>";
+ $table_content .=
"<tr><td>{$i}</td><td>{$entry_date}</td><td>{$user_name}</td><td>{$ticket['details']}</td></tr>";
+
$additional_notes =
$this->read_additional_notes($id);
foreach ($additional_notes as $value)
@@ -937,7 +949,8 @@
if(
(isset($GLOBALS['phpgw']->preferences->data['helpdesk']['tts_notify_me'])
&&
($GLOBALS['phpgw']->preferences->data['helpdesk']['tts_notify_me'] == 1)
)
- ||
($this->config->config_data['ownernotification'] && $ticket['user_id']))
+ ||
($this->config->config_data['ownernotification'] && $ticket['user_id'])
+ || $ticket['reverse_id'])
{
// add owner to recipients
$members[$ticket['user_id']] =
$GLOBALS['phpgw']->accounts->id2name($ticket['user_id']);
@@ -964,7 +977,7 @@
foreach($members as $account_id => $account_name)
{
$prefs =
$this->bocommon->create_preferences('helpdesk',$account_id);
- if(!isset($prefs['tts_notify_me']) ||
$prefs['tts_notify_me'] == 1)
+ if(!isset($prefs['tts_notify_me']) ||
$prefs['tts_notify_me'] == 1 || $ticket['reverse_id'])
{
/**
* Calculate email from username
Modified: branches/Version-2_0-branch/helpdesk/inc/class.sotts.inc.php
===================================================================
--- branches/Version-2_0-branch/helpdesk/inc/class.sotts.inc.php
2017-05-05 14:26:46 UTC (rev 16701)
+++ branches/Version-2_0-branch/helpdesk/inc/class.sotts.inc.php
2017-05-05 14:28:04 UTC (rev 16702)
@@ -266,7 +266,7 @@
{
if($value)
{
- $filtermethod .= "{$or}
phpgw_helpdesk_tickets.status = '{$value}'";
+ $filtermethod .= "{$or}
phpgw_helpdesk_tickets.status = '{$value}'";
$or = ' OR';
}
}
@@ -508,9 +508,10 @@
if ($this->db->next_record())
{
- $ticket['assignedto'] =
$this->db->f('assignedto');
- $ticket['user_id'] =
$this->db->f('user_id');
- $ticket['group_id'] =
$this->db->f('group_id');
+ $ticket['assignedto'] =
(int)$this->db->f('assignedto');
+ $ticket['user_id'] =
(int)$this->db->f('user_id');
+ $ticket['group_id'] =
(int)$this->db->f('group_id');
+ $ticket['reverse_id'] =
(int)$this->db->f('reverse_id');
$ticket['status'] =
$this->db->f('status');
$ticket['cat_id'] =
$this->db->f('cat_id');
$ticket['subject'] =
$this->db->f('subject', true);
@@ -541,9 +542,12 @@
$ticket['billable_hours'] =
$this->db->f('billable_hours');
$ticket['modified_date'] =
$this->db->f('modified_date');
- $user_id=(int)$this->db->f('user_id');
+ if($ticket['reverse_id'])
+ {
+ $ticket['reverse_name'] =
$GLOBALS['phpgw']->accounts->get($ticket['reverse_id'])->__toString();
+ }
- $ticket['user_name'] =
$GLOBALS['phpgw']->accounts->get($user_id)->__toString();
+ $ticket['user_name'] =
$GLOBALS['phpgw']->accounts->get($ticket['user_id'])->__toString();
if ($ticket['assignedto'] > 0)
{
$ticket['assignedto_name'] =
$GLOBALS['phpgw']->accounts->get($ticket['assignedto'])->__toString();
@@ -554,7 +558,7 @@
$ticket['attributes'] =
$values['attributes'];
foreach ($ticket['attributes'] as
&$attr)
{
- $attr['value'] =
$this->db->f($attr['column_name']);
+ $attr['value'] =
$this->db->f($attr['column_name'], true);
}
}
}
@@ -594,8 +598,15 @@
}
}
+ if(!empty($ticket['reverse_id']))
+ {
+ $ticket['assignedto'] =
$GLOBALS['phpgw_info']['user']['account_id'];
+ }
+ $ticket['user_id'] = !empty($ticket['reverse_id'])
? $ticket['reverse_id'] : $GLOBALS['phpgw_info']['user']['account_id'];
+
$value_set['priority'] = isset($ticket['priority']) ?
$ticket['priority'] : 0;
- $value_set['user_id'] =
$GLOBALS['phpgw_info']['user']['account_id'];
+ $value_set['user_id'] = $ticket['user_id'];
+ $value_set['reverse_id'] =
$GLOBALS['phpgw_info']['user']['account_id']; //The originator for the reversed
ticket
$value_set['assignedto'] = $ticket['assignedto'];
$value_set['group_id'] = $ticket['group_id'];
$value_set['subject'] =
$this->db->db_addslashes($ticket['subject']);
@@ -1133,7 +1144,7 @@
throw new Exception("phpgwapi_locations::get_id
('helpdesk', '.ticket') returned 0");
}
- $this->db->transaction_begin();
+ $this->db->transaction_begin();
$this->db->query("DELETE FROM fm_action_pending WHERE
location_id = {$location_id} AND item_id = {$id}",__LINE__,__FILE__);
$this->db->query("DELETE FROM phpgw_interlink WHERE
location1_id = {$location_id} AND location1_item_id = {$id}",__LINE__,__FILE__);
Modified: branches/Version-2_0-branch/helpdesk/inc/class.uitts.inc.php
===================================================================
--- branches/Version-2_0-branch/helpdesk/inc/class.uitts.inc.php
2017-05-05 14:26:46 UTC (rev 16701)
+++ branches/Version-2_0-branch/helpdesk/inc/class.uitts.inc.php
2017-05-05 14:28:04 UTC (rev 16702)
@@ -1801,7 +1801,7 @@
'value_id' => '', //not from
historytable
'value_count' => 1,
'value_date' =>
$GLOBALS['phpgw']->common->show_date($ticket['timestamp']),
- 'value_user' => $ticket['user_name'],
+ 'value_user' => $ticket['reverse_id']?
$ticket['reverse_name'] : $ticket['user_name'],
'value_note' => $ticket['details'],
'value_publish' =>
$ticket['publish_note']
)
@@ -1839,7 +1839,8 @@
'data' => json_encode($additional_notes),
'config' => array(
array('disableFilter' => true),
- array('disablePagination' => true)
+ array('disablePagination' => true),
+ array('order' =>
json_encode(array(0,'asc')))
)
);
@@ -2030,6 +2031,7 @@
'lang_user_statustext' => lang('Select the user
the selection belongs to. To do not use a user select NO USER'),
'select_user_name' => 'values[assignedto]',
'value_assignedto_id' => $ticket['assignedto'],
+ 'value_owned_by' =>
$ticket['user_name'],
'user_list' =>
$this->_get_user_list($ticket['assignedto']),
'lang_no_group' => lang('No group'),
'group_list' =>
$this->bo->get_group_list($ticket['group_id']),
Modified:
branches/Version-2_0-branch/helpdesk/inc/custom/default/ticket_LRS_pre_commit_validate.php
===================================================================
---
branches/Version-2_0-branch/helpdesk/inc/custom/default/ticket_LRS_pre_commit_validate.php
2017-05-05 14:26:46 UTC (rev 16701)
+++
branches/Version-2_0-branch/helpdesk/inc/custom/default/ticket_LRS_pre_commit_validate.php
2017-05-05 14:28:04 UTC (rev 16702)
@@ -37,6 +37,12 @@
{
return;
}
+
+ if(!empty($data['reverse_id']))
+ {
+ return true;
+ }
+
$org_unit = (int)$values_attribute['1']['value'];
$sql = "SELECT arbeidssted FROM fm_org_unit WHERE id =
{$org_unit}";
$this->db->query($sql);
Modified: branches/Version-2_0-branch/helpdesk/setup/phpgw_no.lang
===================================================================
--- branches/Version-2_0-branch/helpdesk/setup/phpgw_no.lang 2017-05-05
14:26:46 UTC (rev 16701)
+++ branches/Version-2_0-branch/helpdesk/setup/phpgw_no.lang 2017-05-05
14:28:04 UTC (rev 16702)
@@ -200,4 +200,5 @@
modified helpdesk no Endret
sent helpdesk no Sendt
generic helpdesk no Generelt
-reverse helpdesk no Revers tildeling
\ No newline at end of file
+reverse helpdesk no Revers tildeling
+owned by helpdesk no Eies av
\ No newline at end of file
Modified: branches/Version-2_0-branch/helpdesk/setup/setup.inc.php
===================================================================
--- branches/Version-2_0-branch/helpdesk/setup/setup.inc.php 2017-05-05
14:26:46 UTC (rev 16701)
+++ branches/Version-2_0-branch/helpdesk/setup/setup.inc.php 2017-05-05
14:28:04 UTC (rev 16702)
@@ -12,7 +12,7 @@
*/
$setup_info['helpdesk']['name'] = 'helpdesk';
- $setup_info['helpdesk']['version'] = '0.9.18.004';
+ $setup_info['helpdesk']['version'] = '0.9.18.005';
$setup_info['helpdesk']['app_order'] = 8;
$setup_info['helpdesk']['enable'] = 1;
$setup_info['helpdesk']['app_group'] = 'office';
Modified: branches/Version-2_0-branch/helpdesk/setup/tables_current.inc.php
===================================================================
--- branches/Version-2_0-branch/helpdesk/setup/tables_current.inc.php
2017-05-05 14:26:46 UTC (rev 16701)
+++ branches/Version-2_0-branch/helpdesk/setup/tables_current.inc.php
2017-05-05 14:28:04 UTC (rev 16702)
@@ -35,6 +35,7 @@
'priority' => array('type' => 'int','precision'
=> '2','nullable' => False),
'user_id' => array('type' => 'int','precision'
=> '4','nullable' => True),
'assignedto' => array('type' =>
'int','precision' => '4','nullable' => True),
+ 'reverse_id' => array('type' =>
'int','precision' => '4','nullable' => True),
'subject' => array('type' =>
'varchar','precision' => '255','nullable' => True),
'cat_id' => array('type' => 'int','precision'
=> '4','nullable' => True),
'billable_hours' => array('type' =>
'decimal','precision' => '8','scale' => '2','nullable' => True),
Modified: branches/Version-2_0-branch/helpdesk/setup/tables_update.inc.php
===================================================================
--- branches/Version-2_0-branch/helpdesk/setup/tables_update.inc.php
2017-05-05 14:26:46 UTC (rev 16701)
+++ branches/Version-2_0-branch/helpdesk/setup/tables_update.inc.php
2017-05-05 14:28:04 UTC (rev 16702)
@@ -216,4 +216,25 @@
$GLOBALS['setup_info']['helpdesk']['currentver'] =
'0.9.18.004';
return $GLOBALS['setup_info']['helpdesk']['currentver'];
}
+ }
+ /**
+ * Update helpdesk version from 0.9.18.004 to 0.9.18.005
+ */
+ $test[] = '0.9.18.004';
+
+ function helpdesk_upgrade0_9_18_004()
+ {
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_helpdesk_tickets',
'reverse_id', array(
+ 'type' => 'int',
+ 'precision' => '4',
+ 'nullable' => true
+ ));
+
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ $GLOBALS['setup_info']['helpdesk']['currentver'] =
'0.9.18.005';
+ return $GLOBALS['setup_info']['helpdesk']['currentver'];
+ }
}
\ No newline at end of file
Modified: branches/Version-2_0-branch/helpdesk/templates/base/tts.xsl
===================================================================
--- branches/Version-2_0-branch/helpdesk/templates/base/tts.xsl 2017-05-05
14:26:46 UTC (rev 16701)
+++ branches/Version-2_0-branch/helpdesk/templates/base/tts.xsl 2017-05-05
14:28:04 UTC (rev 16702)
@@ -87,18 +87,18 @@
<xsl:call-template name="user_id_select"/>
</div>
</xsl:if>
- <div class="pure-control-group">
- <xsl:variable
name="lang_reverse">
- <xsl:value-of
select="php:function('lang', 'reverse')"/>
- </xsl:variable>
- <label>
- <xsl:value-of
select="$lang_reverse"/>
- </label>
- <input type="hidden"
id="reverse_id" name="values[reverse_id]" value="{value_reverse_id}"/>
- <input type="text"
id="reverse_name" name="values[reverse_name]" value="{value_reverse_name}"
class="pure-input-1-2">
- </input>
- <div
id="reverse_container"/>
- </div>
+ <div
class="pure-control-group">
+ <xsl:variable
name="lang_reverse">
+
<xsl:value-of select="php:function('lang', 'reverse')"/>
+ </xsl:variable>
+ <label>
+
<xsl:value-of select="$lang_reverse"/>
+ </label>
+ <input
type="hidden" id="reverse_id" name="values[reverse_id]"
value="{value_reverse_id}"/>
+ <input
type="text" id="reverse_name" name="values[reverse_name]"
value="{value_reverse_name}" class="pure-input-1-2">
+ </input>
+ <div
id="reverse_container"/>
+ </div>
<!--xsl:call-template
name="contact_form"/-->
<!--div
class="pure-control-group">
<label>
@@ -262,9 +262,9 @@
function response_lookup()
{
- var oArgs =
{menuaction:'helpdesk.uilookup.response_template',type:'response_template'};
- var strURL = phpGWLink('index.php', oArgs);
- TINY.box.show({iframe:strURL,
boxid:"frameless",width:750,height:450,fixed:false,maskid:"darkmask",maskopacity:40,
mask:true, animate:true, close: true});
+ var oArgs =
{menuaction:'helpdesk.uilookup.response_template',type:'response_template'};
+ var strURL = phpGWLink('index.php', oArgs);
+ TINY.box.show({iframe:strURL,
boxid:"frameless",width:750,height:450,fixed:false,maskid:"darkmask",maskopacity:40,
mask:true, animate:true, close: true});
}
var my_groups = <xsl:value-of select="my_groups"/>;
@@ -277,10 +277,10 @@
function open_print_view()
{
- var oArgs = {menuaction:'helpdesk.uitts._print',id:
$('#id').val()};
- var strURL = phpGWLink('index.php', oArgs);
- var win = window.open(strURL, '_blank');
- win.focus();
+ var oArgs = {menuaction:'helpdesk.uitts._print',id:
$('#id').val()};
+ var strURL = phpGWLink('index.php', oArgs);
+ var win = window.open(strURL, '_blank');
+ win.focus();
}
@@ -315,8 +315,13 @@
</input>
<input type="hidden" id="id"
name="id" value="{id}">
</input>
-
</div>
+ <div class="pure-control-group">
+ <label>
+ <xsl:value-of
select="php:function('lang', 'owned by')"/>
+ </label>
+ <xsl:value-of
select="value_owned_by"/>
+ </div>
<xsl:for-each select="value_origin">
<div class="pure-control-group">
<label>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [16702] Stable: Merge 16700:16701 from trunk,
sigurdne <=