[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [7403] Merge 7401:7402 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [7403] Merge 7401:7402 from trunk |
|
Date: |
Mon, 20 Jun 2011 09:07:45 +0000 |
Revision: 7403
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7403
Author: sigurdne
Date: 2011-06-20 09:07:45 +0000 (Mon, 20 Jun 2011)
Log Message:
-----------
Merge 7401:7402 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/property/inc/class.uiproject.inc.php
branches/Version-1_0-branch/property/inc/class.uirequest.inc.php
branches/Version-1_0-branch/property/templates/base/project.xsl
branches/Version-1_0-branch/property/templates/base/request.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,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400
+
/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,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402
Modified: branches/Version-1_0-branch/property/inc/class.uiproject.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uiproject.inc.php
2011-06-20 09:06:31 UTC (rev 7402)
+++ branches/Version-1_0-branch/property/inc/class.uiproject.inc.php
2011-06-20 09:07:45 UTC (rev 7403)
@@ -1658,7 +1658,7 @@
(
'suppressmeter'
=> isset($config->config_data['project_suppressmeter']) &&
$config->config_data['project_suppressmeter'] ? 1 : '',
'suppresscoordination'
=> $suppresscoordination,
- 'attributes'
=> $values['attributes'],
+ 'custom_attributes'
=> array('attributes' => $values['attributes']),
'lookup_functions'
=>
isset($values['lookup_functions'])?$values['lookup_functions']:'',
'b_account_data'
=> $b_account_data,
'ecodimb_data'
=> $ecodimb_data,
@@ -1830,7 +1830,7 @@
$template_vars = array();
$template_vars['datatable'] = $datatable;
- $GLOBALS['phpgw']->xslttpl->add_file(array('project'));
+
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('edit' => $data));
$GLOBALS['phpgw']->css->validate_file('datatable');
@@ -1902,7 +1902,7 @@
$id = phpgw::get_var('id', 'int');
- $GLOBALS['phpgw']->xslttpl->add_file(array('project'));
+
$GLOBALS['phpgw']->xslttpl->add_file(array('project','attributes_form'));
$values = $this->bo->read_single($id);
@@ -1985,8 +1985,7 @@
'project_group_data'
=> $project_group_data,
'value_origin'
=> $values['origin'],
- // 'value_origin_type'
=> $origin,
- // 'value_origin_id'
=> $origin_id,
+ 'custom_attributes'
=> array('attributes' => $values['attributes']),
'table_header_workorder_budget'
=> $table_header_workorder_budget,
'lang_no_workorders'
=> lang('No workorder budget'),
Modified: branches/Version-1_0-branch/property/inc/class.uirequest.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uirequest.inc.php
2011-06-20 09:06:31 UTC (rev 7402)
+++ branches/Version-1_0-branch/property/inc/class.uirequest.inc.php
2011-06-20 09:07:45 UTC (rev 7403)
@@ -1328,7 +1328,7 @@
'value_authorities_demands'
=> isset($this->config->config_data['authorities_demands']) &&
$this->config->config_data['authorities_demands'] ?
$this->config->config_data['authorities_demands'] : 0,
'suppressmeter'
=> isset($this->config->config_data['project_suppressmeter'])
&& $this->config->config_data['project_suppressmeter'] ? 1 : '',
'show_dates'
=> $show_dates,
- 'attributes'
=> $values['attributes'],
+ 'custom_attributes'
=> array('attributes' => $values['attributes']),
'property_js'
=>
json_encode($GLOBALS['phpgw_info']['server']['webserver_url']."/property/js/yahoo/property2.js"),
'datatable'
=> $datavalues,
'myColumnDefs'
=> $myColumnDefs,
Modified: branches/Version-1_0-branch/property/templates/base/project.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/project.xsl
2011-06-20 09:06:31 UTC (rev 7402)
+++ branches/Version-1_0-branch/property/templates/base/project.xsl
2011-06-20 09:07:45 UTC (rev 7403)
@@ -372,7 +372,7 @@
</textarea>
</td>
</tr>
- <xsl:call-template name="attributes"/>
+ <xsl:apply-templates select="custom_attributes/attributes"/>
</table>
</div>
@@ -969,6 +969,7 @@
</xsl:choose>
</xsl:for-each>
</tr>
+ <xsl:apply-templates
select="custom_attributes/attributes"/>
</table>
</div>
Modified: branches/Version-1_0-branch/property/templates/base/request.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/request.xsl
2011-06-20 09:06:31 UTC (rev 7402)
+++ branches/Version-1_0-branch/property/templates/base/request.xsl
2011-06-20 09:07:45 UTC (rev 7403)
@@ -576,7 +576,7 @@
</table>
</td>
</tr>
-
<xsl:call-template name="attributes"/>
+
<xsl:apply-templates select="custom_attributes/attributes"/>
<tr>
<td>
<br/>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [7403] Merge 7401:7402 from trunk,
Sigurd Nes <=