[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [7179] Merge 7177:7178 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [7179] Merge 7177:7178 from trunk |
|
Date: |
Tue, 05 Apr 2011 09:32:28 +0000 |
Revision: 7179
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7179
Author: sigurdne
Date: 2011-04-05 09:32:28 +0000 (Tue, 05 Apr 2011)
Log Message:
-----------
Merge 7177:7178 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/property/inc/class.sorequest.inc.php
branches/Version-1_0-branch/property/inc/class.uirequest.inc.php
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
+
/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
Modified: branches/Version-1_0-branch/property/inc/class.sorequest.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.sorequest.inc.php
2011-04-05 09:28:58 UTC (rev 7178)
+++ branches/Version-1_0-branch/property/inc/class.sorequest.inc.php
2011-04-05 09:32:28 UTC (rev 7179)
@@ -79,11 +79,11 @@
}
- function update_score($request_id='')
+ function update_score($request_id = 0)
{
if($request_id)
{
- $request[] = $request_id;
+ $request[] = (int)$request_id;
}
else
{
@@ -96,6 +96,10 @@
}
}
+ $config = CreateObject('phpgwapi.config','property');
+ $config->read();
+ $authorities_demands = isset(
$config->config_data['authorities_demands']) &&
$config->config_data['authorities_demands'] ?
$config->config_data['authorities_demands'] : 0;
+
foreach ($request as $id)
{
if($GLOBALS['phpgw_info']['server']['db_type']=='pgsql' ||
$GLOBALS['phpgw_info']['server']['db_type']=='postgres')
@@ -117,7 +121,7 @@
$this->db->query("UPDATE fm_request SET
score = $score WHERE id = $id",__LINE__,__FILE__);
}
- $this->db->query("UPDATE fm_request SET score =
score +10000 WHERE id = $id AND authorities_demands = 1",__LINE__,__FILE__);
+ $this->db->query("UPDATE fm_request SET score =
score + {$authorities_demands} WHERE id = $id AND authorities_demands =
1",__LINE__,__FILE__);
}
}
Modified: branches/Version-1_0-branch/property/inc/class.uirequest.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uirequest.inc.php
2011-04-05 09:28:58 UTC (rev 7178)
+++ branches/Version-1_0-branch/property/inc/class.uirequest.inc.php
2011-04-05 09:32:28 UTC (rev 7179)
@@ -791,9 +791,15 @@
$GLOBALS['phpgw_info']['flags']['noframework'] = true;
$values = phpgw::get_var('values');
+ $config = CreateObject('phpgwapi.config','property');
+ $config->read();
+ $values['authorities_demands'] =
$values['authorities_demands'] ? $values['authorities_demands'] :
$config->config_data['authorities_demands'];
+
if($values['update'])
{
$receipt =
$this->bo->update_priority_key($values);
+ $config->config_data['authorities_demands'] =
(int) $values['authorities_demands'];
+ $config->save_repository();
}
$function_msg = lang('Edit priority key');
@@ -813,13 +819,14 @@
$data = array
(
- 'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
- 'function_msg'
=> $function_msg,
- 'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
+ 'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
+ 'function_msg'
=> $function_msg,
+ 'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'lang_priority_key_statustext'
=> lang('Weight for prioritising'),
- 'lang_save'
=> lang('save'),
- 'priority_key'
=> $priority_key,
- 'exchange_values' =>
$function_exchange_values
+ 'lang_save'
=> lang('save'),
+ 'priority_key'
=> $priority_key,
+ 'exchange_values'
=> $function_exchange_values,
+ 'value_authorities_demands'
=> $values['authorities_demands']
);
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('priority_form' => $data));
@@ -1315,10 +1322,10 @@
}
}
-
$data = array
(
'mode'
=> $mode,
+ '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'],
Modified: branches/Version-1_0-branch/property/templates/base/request.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/request.xsl
2011-04-05 09:28:58 UTC (rev 7178)
+++ branches/Version-1_0-branch/property/templates/base/request.xsl
2011-04-05 09:32:28 UTC (rev 7179)
@@ -14,7 +14,7 @@
</xsl:choose>
</xsl:template>
- <xsl:template match="priority_form">
+ <xsl:template match="priority_form" xmlns:php="http://php.net/xsl";>
<xsl:variable name="form_action"><xsl:value-of
select="form_action"/></xsl:variable>
<form method="post" action="{$form_action}">
<div align="left">
@@ -29,6 +29,18 @@
</xsl:when>
</xsl:choose>
<xsl:apply-templates
select="priority_key"/>
+ <tr>
+ <td class="small_text"
align="left">
+ <xsl:value-of
select="php:function('lang', 'Authorities Demands')" />
+ </td>
+ <td class="small_text"
align="left">
+ <input type="text"
size="5" name="values[authorities_demands]" value="{value_authorities_demands}">
+ <xsl:attribute
name="title">
+
<xsl:value-of select="php:function('lang', 'Authorities Demands')" />
+ </xsl:attribute>
+ </input>
+ </td>
+ </tr>
<tr height="50">
<td>
<xsl:variable
name="lang_save"><xsl:value-of select="lang_save"/></xsl:variable>
@@ -502,10 +514,12 @@
<select name="values[authorities_demands]" class="forms">
<xsl:attribute name="title">
<xsl:value-of select="php:function('lang', 'Is
there a demand from the authorities to correct this condition?')" />
+
<xsl:text> + </xsl:text>
+
<xsl:value-of
select="value_authorities_demands"/>
</xsl:attribute>
<option value="0"><xsl:value-of
select="php:function('lang', 'no authorities demands')" /></option>
<xsl:apply-templates
select="authorities_demands/options"/>
-
</select>
+
</select>
</td>
</tr>
<tr>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [7179] Merge 7177:7178 from trunk,
Sigurd Nes <=