[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [7112] Merge 7106:7111 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [7112] Merge 7106:7111 from trunk |
|
Date: |
Fri, 11 Mar 2011 12:46:45 +0000 |
Revision: 7112
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7112
Author: sigurdne
Date: 2011-03-11 12:46:45 +0000 (Fri, 11 Mar 2011)
Log Message:
-----------
Merge 7106:7111 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/phpgwapi/inc/class.acl.inc.php
branches/Version-1_0-branch/phpgwapi/setup/setup.inc.php
branches/Version-1_0-branch/phpgwapi/setup/tables_current.inc.php
branches/Version-1_0-branch/phpgwapi/setup/tables_update.inc.php
branches/Version-1_0-branch/property/inc/class.boproject.inc.php
branches/Version-1_0-branch/property/inc/class.sobudget.inc.php
branches/Version-1_0-branch/property/inc/class.uiproject.inc.php
branches/Version-1_0-branch/property/inc/class.uiworkorder.inc.php
branches/Version-1_0-branch/property/setup/phpgw_no.lang
branches/Version-1_0-branch/property/templates/base/files.xsl
Property Changed:
----------------
branches/Version-1_0-branch/
Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105
+
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.acl.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.acl.inc.php 2011-03-11
12:44:33 UTC (rev 7111)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.acl.inc.php 2011-03-11
12:46:45 UTC (rev 7112)
@@ -480,8 +480,12 @@
}
// using stored prosedures
- $sql = 'INSERT INTO phpgw_acl (acl_account, acl_rights,
acl_grantor, acl_type, location_id)'
- . ' VALUES(?, ?, ?, ?,
?)';
+ $sql = 'INSERT INTO phpgw_acl (acl_account, acl_rights,
acl_grantor, acl_type, location_id, modified_on, modified_by)'
+ . ' VALUES(?, ?, ?, ?,
?, ?, ?)';
+
+ $now = time();
+ $mod_account =
$GLOBALS['phpgw_info']['user']['account_id'] ?
$GLOBALS['phpgw_info']['user']['account_id'] : -1;
+
$valueset=array();
foreach ( $new_data as $loc_id => $grants )
@@ -516,7 +520,17 @@
(
'value' =>
$loc_id,
'type' =>
PDO::PARAM_INT
- ),
+ ),
+ 6 => array
+ (
+ 'value' => $now,
+ 'type' =>
PDO::PARAM_INT
+ ),
+ 7 => array
+ (
+ 'value' =>
$mod_account,
+ 'type' =>
PDO::PARAM_INT
+ )
);
}
}
@@ -529,7 +543,7 @@
/*remove duplicates*/
- $sql = "SELECT * FROM phpgw_acl WHERE acl_account =
{$acct_id}"
+ $sql = "SELECT acl_account, acl_rights, acl_grantor,
acl_type, location_id FROM phpgw_acl WHERE acl_account = {$acct_id}"
. ' GROUP BY acl_account, acl_rights, acl_grantor,
acl_type, location_id';
$this->_db->query($sql,__LINE__,__FILE__);
@@ -572,7 +586,17 @@
(
'value' =>
$_location_id,
'type' =>
PDO::PARAM_INT
- ),
+ ),
+ 6 => array
+ (
+ 'value' => $now,
+ 'type' =>
PDO::PARAM_INT
+ ),
+ 7 => array
+ (
+ 'value' => $mod_account,
+ 'type' =>
PDO::PARAM_INT
+ )
);
}
//
$test[$_acl_account][$_acl_grantor][$_acl_type][$_location_id] = true;
@@ -582,8 +606,8 @@
. " WHERE acl_account = {$acct_id}";
$this->_db->query($sql, __LINE__, __FILE__);
- $sql = 'INSERT INTO phpgw_acl (acl_account, acl_rights,
acl_grantor, acl_type, location_id)'
- . ' VALUES(?, ?, ?, ?,
?)';
+ $sql = 'INSERT INTO phpgw_acl (acl_account, acl_rights,
acl_grantor, acl_type, location_id, modified_on, modified_by)'
+ . ' VALUES(?, ?, ?, ?,
?, ?, ?)';
$this->_db->insert($sql, $unique_data, __LINE__,
__FILE__);
unset($unique_data);
@@ -647,6 +671,9 @@
. ' GROUP BY acl_account, acl_rights, acl_grantor,
acl_type, location_id';
$this->_db->query($sql,__LINE__,__FILE__);
+ $now = time();
+ $mod_account =
$GLOBALS['phpgw_info']['user']['account_id'] ?
$GLOBALS['phpgw_info']['user']['account_id'] : -1;
+
$cache_info = array();
while($this->_db->next_record())
{
@@ -678,15 +705,25 @@
(
'value' =>
$this->_db->f('location_id'),
'type' => PDO::PARAM_INT
- ),
+ ),
+ 6 => array
+ (
+ 'value' => $now,
+ 'type' => PDO::PARAM_INT
+ ),
+ 7 => array
+ (
+ 'value' => $mod_account,
+ 'type' => PDO::PARAM_INT
+ )
);
}
$sql = "DELETE FROM phpgw_acl {$condition}";
$this->_db->query($sql, __LINE__, __FILE__);
- $sql = 'INSERT INTO phpgw_acl (acl_account, acl_rights,
acl_grantor, acl_type, location_id)'
- . ' VALUES(?, ?, ?, ?,
?)';
+ $sql = 'INSERT INTO phpgw_acl (acl_account, acl_rights,
acl_grantor, acl_type, location_id, modified_on, modified_by)'
+ . ' VALUES(?, ?, ?, ?,
?, ?, ?)';
$this->_db->insert($sql, $unique_data, __LINE__,
__FILE__);
unset($unique_data);
@@ -964,10 +1001,13 @@
$inherit_location[] =
$this->_db->f('location_id');
}
+ $now = time();
+ $mod_account =
$GLOBALS['phpgw_info']['user']['account_id'] ?
$GLOBALS['phpgw_info']['user']['account_id'] : -1;
+
foreach ( $inherit_location as $acl_location )
{
- $sql = 'INSERT INTO phpgw_acl (location_id,
acl_account, acl_rights, acl_grantor, acl_type)'
- . " VALUES ('{$acl_location}',
{$account_id}, {$rights}, -1 , 0)";
+ $sql = 'INSERT INTO phpgw_acl (location_id,
acl_account, acl_rights, acl_grantor, acl_type, modified_on, modified_by)'
+ . " VALUES ('{$acl_location}',
{$account_id}, {$rights}, -1 , 0, {$now}, {$mod_account})";
$this->_db->query($sql, __LINE__, __FILE__);
}
Modified: branches/Version-1_0-branch/phpgwapi/setup/setup.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/setup/setup.inc.php 2011-03-11
12:44:33 UTC (rev 7111)
+++ branches/Version-1_0-branch/phpgwapi/setup/setup.inc.php 2011-03-11
12:46:45 UTC (rev 7112)
@@ -12,7 +12,7 @@
// Basic information about this app
$setup_info['phpgwapi']['name'] = 'phpgwapi';
$setup_info['phpgwapi']['title'] = 'phpgwapi';
- $setup_info['phpgwapi']['version'] = '0.9.17.532';
+ $setup_info['phpgwapi']['version'] = '0.9.17.533';
$setup_info['phpgwapi']['versions']['current_header'] = '1.31';
$setup_info['phpgwapi']['versions']['system'] = '1.0';
$setup_info['phpgwapi']['enable'] = 3;
Modified: branches/Version-1_0-branch/phpgwapi/setup/tables_current.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/setup/tables_current.inc.php
2011-03-11 12:44:33 UTC (rev 7111)
+++ branches/Version-1_0-branch/phpgwapi/setup/tables_current.inc.php
2011-03-11 12:46:45 UTC (rev 7112)
@@ -42,6 +42,8 @@
'acl_grantor' => array('type' => 'int',
'precision' => 4, 'nullable' => true, 'default' => '-1'),
'acl_type' => array('type' => 'int',
'precision' => 2, 'nullable' => true, 'default' => '0'),
'location_id' => array('type' => 'int',
'precision' => 4),
+ 'modified_on' => array('type' =>
'int','precision' => 4,'nullable' => False),
+ 'modified_by' => array('type' =>
'int','precision' => 4,'nullable' => False, 'default' => '-1')
),
'pk' => array(),
'ix' => array('location_id','acl_account'),
Modified: branches/Version-1_0-branch/phpgwapi/setup/tables_update.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/setup/tables_update.inc.php
2011-03-11 12:44:33 UTC (rev 7111)
+++ branches/Version-1_0-branch/phpgwapi/setup/tables_update.inc.php
2011-03-11 12:46:45 UTC (rev 7112)
@@ -2864,3 +2864,37 @@
}
}
+ $test[] = '0.9.17.532';
+ /**
+ * Add mod-info to acl
+ *
+ * @return string the new version number
+ */
+ function phpgwapi_upgrade0_9_17_532()
+ {
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_acl','modified_on',array(
+ 'type' => 'int',
+ 'precision' => '4',
+ 'nullable' => True
+ ));
+
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_acl','modified_by',array(
+ 'type' => 'int',
+ 'precision' => '4',
+ 'nullable' => True,
+ 'default' => -1
+ ));
+
+ $now = time();
+
+ $GLOBALS['phpgw_setup']->oProc->query("UPDATE phpgw_acl SET
modified_on = {$now}, modified_by = -1");
+
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ $GLOBALS['setup_info']['phpgwapi']['currentver'] =
'0.9.17.533';
+ return $GLOBALS['setup_info']['phpgwapi']['currentver'];
+ }
+ }
+
Modified: branches/Version-1_0-branch/property/inc/class.boproject.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.boproject.inc.php
2011-03-11 12:44:33 UTC (rev 7111)
+++ branches/Version-1_0-branch/property/inc/class.boproject.inc.php
2011-03-11 12:46:45 UTC (rev 7112)
@@ -79,16 +79,47 @@
$criteria_id =
phpgw::get_var('criteria_id', 'int');
$this->start = $start ? $start : 0;
- $this->query = isset($query) ?
$query : $this->query;
- $this->sort = isset($sort)
&& $sort ? $sort : '';
- $this->order = isset($order) &&
$order ? $order : '';
- $this->filter = isset($filter) &&
$filter ? $filter : '';
- $this->cat_id = isset($cat_id) &&
$cat_id ? $cat_id : '';
- $this->status_id = isset($status_id) &&
$status_id ? $status_id : '';
- $this->user_id = isset($user_id) &&
$user_id ? $user_id : '';
- $this->wo_hour_cat_id = isset($wo_hour_cat_id) &&
$wo_hour_cat_id ? $wo_hour_cat_id : '';
- $this->district_id = isset($district_id)
&& $district_id ? $district_id : '';
- $this->criteria_id = isset($criteria_id)
&& $criteria_id ? $criteria_id : '';
+
+ if(isset($_POST['query']) || isset($_GET['query']))
+ {
+ $this->query = $query;
+ }
+ if(isset($_POST['sort']) || isset($_GET['sort']))
+ {
+ $this->sort = $sort;
+ }
+ if(isset($_POST['order']) || isset($_GET['order']))
+ {
+ $this->order = $order;
+ }
+ if(isset($_POST['filter']) || isset($_GET['filter']))
+ {
+ $this->filter = $filter;
+ }
+ if(isset($_POST['cat_id']) || isset($_GET['cat_id']))
+ {
+ $this->cat_id = $cat_id;
+ }
+ if(isset($_POST['status_id']) ||
isset($_GET['status_id']))
+ {
+ $this->status_id = $status_id;
+ }
+ if(isset($_POST['user_id']) || isset($_GET['user_id']))
+ {
+ $this->user_id = $user_id;
+ }
+ if(isset($_POST['wo_hour_cat_id']) ||
isset($_GET['wo_hour_cat_id']))
+ {
+ $this->wo_hour_cat_id = $wo_hour_cat_id;
+ }
+ if(isset($_POST['district_id']) ||
isset($_GET['district_id']))
+ {
+ $this->district_id = $district_id;
+ }
+ if(isset($_POST['criteria_id']) ||
isset($_GET['criteria_id']))
+ {
+ $this->criteria_id = $criteria_id;
+ }
}
function save_sessiondata($data)
Modified: branches/Version-1_0-branch/property/inc/class.sobudget.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.sobudget.inc.php
2011-03-11 12:44:33 UTC (rev 7111)
+++ branches/Version-1_0-branch/property/inc/class.sobudget.inc.php
2011-03-11 12:46:45 UTC (rev 7112)
@@ -524,7 +524,8 @@
$start_date = mktime(1, 1, 1, 1, 1, $year);
$end_date = mktime (23, 59, 59, 12, 31, $year);
- $filtermethod .= " AND fm_workorder.start_date >=
$start_date AND fm_workorder.start_date <= $end_date";
+// $filtermethod .= " AND fm_workorder.start_date >=
$start_date AND fm_workorder.start_date <= $end_date";
+ $filtermethod .= " AND fm_workorder_status.closed IS
NULL AND fm_workorder.start_date <= $end_date";
$where = 'AND';
@@ -569,10 +570,12 @@
$sql = "SELECT sum(combined_cost) as combined_cost,
count(fm_workorder.id) as hits, fm_b_account.{$b_account_field} as
{$b_account_field}, district_id, fm_workorder.ecodimb"
. " FROM fm_workorder"
- . " $this->join fm_b_account ON
fm_workorder.account_id =fm_b_account.id "
- . " $this->join fm_project ON
fm_workorder.project_id =fm_project.id "
- . " $this->join fm_location1 ON fm_project.loc1
= fm_location1.loc1 "
- . " $this->join fm_part_of_town ON
fm_location1.part_of_town_id = fm_part_of_town.part_of_town_id $filtermethod
$querymethod GROUP BY
fm_b_account.{$b_account_field},district_id,fm_workorder.ecodimb";
+ . " $this->join fm_workorder_status ON
fm_workorder.status = fm_workorder_status.id"
+ . " $this->join fm_b_account ON
fm_workorder.account_id = fm_b_account.id"
+ . " $this->join fm_project ON
fm_workorder.project_id = fm_project.id"
+ . " $this->join fm_location1 ON fm_project.loc1
= fm_location1.loc1"
+ . " $this->join fm_part_of_town ON
fm_location1.part_of_town_id = fm_part_of_town.part_of_town_id"
+ . " $filtermethod $querymethod GROUP BY
fm_b_account.{$b_account_field},district_id,fm_workorder.ecodimb";
//_debug_array($sql);die();
$this->db->query($sql . $ordermethod,__LINE__,__FILE__);
Modified: branches/Version-1_0-branch/property/inc/class.uiproject.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uiproject.inc.php
2011-03-11 12:44:33 UTC (rev 7111)
+++ branches/Version-1_0-branch/property/inc/class.uiproject.inc.php
2011-03-11 12:46:45 UTC (rev 7112)
@@ -192,6 +192,7 @@
$this->district_id =
$default_district;
}
+ $this->save_sessiondata();
$datatable = array();
if( phpgw::get_var('phpgw_return_as') != 'json' )
@@ -200,19 +201,19 @@
$datatable['config']['base_url'] =
$GLOBALS['phpgw']->link('/index.php', array
(
'menuaction'
=> 'property.uiproject.index',
- 'query'
=> $this->query,
- 'district_id' =>
$this->district_id,
- 'part_of_town_id' =>
$this->part_of_town_id,
+ // 'query'
=> $this->query,
+ // 'district_id' =>
$this->district_id,
+ // 'part_of_town_id' =>
$this->part_of_town_id,
'lookup'
=> $lookup,
- 'cat_id'
=> $this->cat_id,
- 'status_id'
=> $this->status_id,
- 'wo_hour_cat_id'
=> $this->wo_hour_cat_id,
- 'user_id'
=> $this->user_id,
- 'criteria_id'
=> $this->criteria_id
+ // 'cat_id'
=> $this->cat_id,
+ // 'status_id'
=> $this->status_id,
+ // 'wo_hour_cat_id'
=> $this->wo_hour_cat_id,
+ // 'user_id'
=> $this->user_id,
+ // 'criteria_id'
=> $this->criteria_id
));
$datatable['config']['base_java_url'] =
"menuaction:'property.uiproject.index',"
- ."query:'{$this->query}',"
+ // ."query:'{$this->query}',"
."district_id: '{$this->district_id}',"
."part_of_town_id:'{$this->part_of_town_id}',"
."lookup:'{$lookup}',"
@@ -877,7 +878,6 @@
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('property') . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->js->validate_file( 'yahoo',
'project.index', 'property' );
- $this->save_sessiondata();
}
function date_search()
Modified: branches/Version-1_0-branch/property/inc/class.uiworkorder.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uiworkorder.inc.php
2011-03-11 12:44:33 UTC (rev 7111)
+++ branches/Version-1_0-branch/property/inc/class.uiworkorder.inc.php
2011-03-11 12:46:45 UTC (rev 7112)
@@ -209,6 +209,7 @@
$this->district_id =
$default_district;
}
+ $this->save_sessiondata();
if( phpgw::get_var('phpgw_return_as') != 'json' )
{
@@ -227,7 +228,7 @@
'cat_id'
=> $this->cat_id,
'status_id'
=> $this->status_id,
'filter'
=> $this->filter,
- 'query'
=> $this->query,
+ // 'query'
=> $this->query,
'start_date' =>
$start_date,
'end_date'
=> $end_date,
'wo_hour_cat_id' =>
$this->wo_hour_cat_id,
@@ -240,7 +241,6 @@
$datatable['config']['allow_allrows'] = false;
$datatable['config']['base_java_url'] =
"menuaction:'property.uiworkorder.index',"
-
."query:'{$this->query}',"
."lookup:'{$lookup}',"
."district_id: '{$this->district_id}',"
@@ -423,7 +423,7 @@
( // TEXT IMPUT
'name'
=> 'query',
'id'
=> 'txt_query',
- 'value'
=> '',//$query,
+ 'value'
=> $this->query,
'type'
=> 'text',
'onkeypress' => 'return pulsar(event)',
'size'
=> 18,
@@ -821,9 +821,6 @@
// Prepare YUI Library
$GLOBALS['phpgw']->js->validate_file( 'yahoo',
'workorder.index', 'property' );
-
- $this->save_sessiondata();
-
}
function edit()
Modified: branches/Version-1_0-branch/property/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/property/setup/phpgw_no.lang 2011-03-11
12:44:33 UTC (rev 7111)
+++ branches/Version-1_0-branch/property/setup/phpgw_no.lang 2011-03-11
12:46:45 UTC (rev 7112)
@@ -185,7 +185,7 @@
async method property no async metode
async method has been saved property no async metode er lagret
async services property no Planlagte oppgaver
-attach file property no legg til vedlegg
+attach file property no Legg til som vedlegg
attachments property no Vedlegg
attribute property no Verdier
attribute has been edited property no Attributt er rettet
Modified: branches/Version-1_0-branch/property/templates/base/files.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/files.xsl
2011-03-11 12:44:33 UTC (rev 7111)
+++ branches/Version-1_0-branch/property/templates/base/files.xsl
2011-03-11 12:46:45 UTC (rev 7112)
@@ -10,7 +10,14 @@
<xsl:value-of
select="php:function('lang', 'filename')" />
</td>
<td class="th_text" width="15%"
align="center">
- <xsl:value-of
select="php:function('lang', 'Delete file')" />
+ <xsl:choose>
+ <xsl:when
test="//lang_file_action!=''">
+ <xsl:value-of
select="lang_file_action"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of
select="php:function('lang', 'Delete file')" />
+ </xsl:otherwise>
+ </xsl:choose>
</td>
</tr>
<xsl:for-each select="files" >
@@ -45,7 +52,14 @@
<td align="center">
<input type="checkbox"
name="values[file_action][]" value="{name}">
<xsl:attribute
name="title">
-
<xsl:value-of select="php:function('lang', 'Check to delete file')" />
+
<xsl:choose>
+
<xsl:when test="//lang_file_action!=''">
+
<xsl:value-of select="//lang_file_action"/>
+
</xsl:when>
+
<xsl:otherwise>
+
<xsl:value-of select="php:function('lang', 'Check to delete file')" />
+
</xsl:otherwise>
+
</xsl:choose>
</xsl:attribute>
</input>
</td>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [7112] Merge 7106:7111 from trunk,
Sigurd Nes <=