[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [6492] merge 6489:6491 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [6492] merge 6489:6491 from trunk |
|
Date: |
Wed, 13 Oct 2010 17:00:50 +0000 |
Revision: 6492
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6492
Author: sigurdne
Date: 2010-10-13 17:00:49 +0000 (Wed, 13 Oct 2010)
Log Message:
-----------
merge 6489:6491 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/frontend/inc/class.uidelegates.inc.php
branches/Version-1_0-branch/frontend/inc/class.uihelpdesk.inc.php
branches/Version-1_0-branch/frontend/setup/phpgw_no.lang
branches/Version-1_0-branch/frontend/templates/base/config.tpl
branches/Version-1_0-branch/frontend/templates/base/delegate.xsl
branches/Version-1_0-branch/property/inc/class.soproject.inc.php
branches/Version-1_0-branch/property/inc/class.sotts.inc.php
branches/Version-1_0-branch/property/inc/class.soworkorder.inc.php
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
+
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491
Modified: branches/Version-1_0-branch/frontend/inc/class.uidelegates.inc.php
===================================================================
--- branches/Version-1_0-branch/frontend/inc/class.uidelegates.inc.php
2010-10-13 16:57:40 UTC (rev 6491)
+++ branches/Version-1_0-branch/frontend/inc/class.uidelegates.inc.php
2010-10-13 17:00:49 UTC (rev 6492)
@@ -120,6 +120,12 @@
$number_of_delegates = count($delegates_per_org_unit);
$number_of_user_delegates = count($delegates_per_user);
+
+ $config = CreateObject('phpgwapi.config','frontend');
+ $config->read();
+ $delegateLimit = $config->config_data['delegate_limit'];
+ if(!is_numeric($delegateLimit)) $delegateLimit = 3;
+ $error_message = lang('max_x_delegates',$delegateLimit);
$data = array (
'header' =>
$this->header_state,
@@ -132,6 +138,8 @@
'number_of_user_delegates' =>
isset($number_of_user_delegates) ? $number_of_user_delegates : 0 ,
'search' => isset($search) ?
$search : array(),
'msgbox_data' =>
$GLOBALS['phpgw']->common->msgbox($GLOBALS['phpgw']->common->msgbox_data($msglog)),
+ 'delegate_limit' => $delegateLimit,
+ 'error_message' => $error_message,
),
);
Modified: branches/Version-1_0-branch/frontend/inc/class.uihelpdesk.inc.php
===================================================================
--- branches/Version-1_0-branch/frontend/inc/class.uihelpdesk.inc.php
2010-10-13 16:57:40 UTC (rev 6491)
+++ branches/Version-1_0-branch/frontend/inc/class.uihelpdesk.inc.php
2010-10-13 17:00:49 UTC (rev 6492)
@@ -141,6 +141,10 @@
if(isset($this->location_code) && $this->location_code
!= '')
{
$bo->location_code = $this->location_code;
+ //to make sure the list select "All" not only
the open ones
+ if(phpgw::get_var("status_id")== ""){
+ $bo->status_id = 'all';
+ }
$ticket_list = $bo->read('','','',$dry_run);
}
else
Modified: branches/Version-1_0-branch/frontend/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/frontend/setup/phpgw_no.lang 2010-10-13
16:57:40 UTC (rev 6491)
+++ branches/Version-1_0-branch/frontend/setup/phpgw_no.lang 2010-10-13
17:00:49 UTC (rev 6492)
@@ -95,7 +95,8 @@
user_found_in_PE frontend no Personen er bruker av dette
systemet.
delegation_successful frontend no Velykket delegering
delegation_error frontend no Feil under delegering
-max_5_delegates frontend no Det er en øvre grense på fem
delegater pr leder
+max_x_delegates rental no Det er en øvre grense på %1 delegater
pr leder
+delegate limit frontend no Maks-delegater
delegates frontend no Delegering
no_buildings frontend no Ingen bygninger tilknyttet
resultatenheten
title_contract_message frontend no Melding angående kontrakt
Modified: branches/Version-1_0-branch/frontend/templates/base/config.tpl
===================================================================
--- branches/Version-1_0-branch/frontend/templates/base/config.tpl
2010-10-13 16:57:40 UTC (rev 6491)
+++ branches/Version-1_0-branch/frontend/templates/base/config.tpl
2010-10-13 17:00:49 UTC (rev 6492)
@@ -37,9 +37,13 @@
</td>
</tr>
<tr class="row_off">
+ <td>{lang_delegate_limit}:</td>
+ <td><input name="newsettings[delegate_limit]"
value="{value_delegate_limit}"></td>
+ </tr>
+ <tr class="row_on">
<td colspan="2"> <b>{lang_external_db}</b></td>
</tr>
- <tr class="row_off">
+ <tr class="row_on">
<td>{lang_Debug}:</td>
<td>
<select name="newsettings[external_db_debug]">
@@ -48,11 +52,11 @@
</select>
</td>
</tr>
- <tr class="row_off">
+ <tr class="row_on">
<td>{lang_login_external_db_host}:</td>
<td><input name="newsettings[external_db_host]"
value="{value_external_db_host}"></td>
</tr>
- <tr class="row_off">
+ <tr class="row_on">
<td>{lang_type}:</td>
<td>
<select name="newsettings[external_db_type]">
@@ -64,24 +68,24 @@
</select>
</td>
</tr>
- <tr class="row_off">
+ <tr class="row_on">
<td>{lang_login_external_db_name}:</td>
<td><input name="newsettings[external_db_name]"
value="{value_external_db_name}"></td>
</tr>
- <tr class="row_off">
+ <tr class="row_on">
<td>{lang_login_external_db_user}:</td>
<td><input name="newsettings[external_db_user]"
value="{value_external_db_user}"></td>
</tr>
- <tr class="row_off">
+ <tr class="row_on">
<td>{lang_login_external_db_password}:</td>
<td><input type ="password"
name="newsettings[external_db_password]"
value="{value_external_db_password}"></td>
</tr>
- <tr class="row_off">
+ <tr class="row_on">
<td colspan="2"> <b>{lang_email_settings}</b></td>
</tr>
- <tr class="row_off">
+ <tr class="row_on">
<td>{lang_email_contract_messages}:</td>
<td><input name="newsettings[email_contract_messages]"
value="{value_email_contract_messages}"></td>
</tr>
Modified: branches/Version-1_0-branch/frontend/templates/base/delegate.xsl
===================================================================
--- branches/Version-1_0-branch/frontend/templates/base/delegate.xsl
2010-10-13 16:57:40 UTC (rev 6491)
+++ branches/Version-1_0-branch/frontend/templates/base/delegate.xsl
2010-10-13 17:00:49 UTC (rev 6492)
@@ -7,7 +7,7 @@
<xsl:when test="//selected_org_unit = 'all' or
$unit_leader = '1'">
<div class="add_delegate" style="width=30%;
height=100%; float: left; padding-left: 2em; padding-top: 2em; padding-bottom:
2em; margin-right: 2em;">
<xsl:choose>
- <xsl:when
test="number_of_delegates < 5">
+ <xsl:when
test="number_of_delegates < delegate_limit">
<img
src="frontend/templates/base/images/16x16/group_add.png"
class="list_image"/><xsl:value-of select="php:function('lang', 'find_user')"/>
<xsl:variable
name="btn_add"><xsl:value-of select="php:function('lang',
'btn_add')"/></xsl:variable>
<xsl:variable
name="btn_search"><xsl:value-of select="php:function('lang',
'btn_search')"/></xsl:variable>
@@ -32,7 +32,7 @@
</form>
</xsl:when>
<xsl:otherwise>
- <xsl:value-of
select="php:function('lang', 'max_5_delegates')"/>
+ <xsl:value-of
select="error_message"/>
</xsl:otherwise>
</xsl:choose>
</div>
Modified: branches/Version-1_0-branch/property/inc/class.soproject.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soproject.inc.php
2010-10-13 16:57:40 UTC (rev 6491)
+++ branches/Version-1_0-branch/property/inc/class.soproject.inc.php
2010-10-13 17:00:49 UTC (rev 6492)
@@ -27,6 +27,8 @@
* @version $Id$
*/
+ phpgw::import_class('phpgwapi.datetime');
+
/**
* Description
* @package property
@@ -107,8 +109,8 @@
$order = (isset($data['order'])?$data['order']:'');
$cat_id = (isset($data['cat_id'])?$data['cat_id']:0);
$status_id =
(isset($data['status_id'])?$data['status_id']:'');
- $start_date =
(isset($data['start_date'])?$data['start_date']:'');
- $end_date =
(isset($data['end_date'])?$data['end_date']:'');
+ $start_date = isset($data['start_date']) &&
$data['start_date'] ? (int)$data['start_date'] : 0;
+ $end_date = isset($data['end_date']) &&
$data['end_date'] ? (int)$data['end_date'] : 0;
$allrows =
(isset($data['allrows'])?$data['allrows']:'');
$wo_hour_cat_id =
(isset($data['wo_hour_cat_id'])?$data['wo_hour_cat_id']:'');
$district_id =
(isset($data['district_id'])?$data['district_id']:'');
@@ -384,6 +386,9 @@
if ($start_date)
{
+ $end_date = $end_date + 3600 * 16 +
phpgwapi_datetime::user_timezone();
+ $start_date = $start_date - 3600 * 8 +
phpgwapi_datetime::user_timezone();
+
$filtermethod .= " $where fm_project.start_date
>= $start_date AND fm_project.start_date <= $end_date ";
$where= 'AND';
}
Modified: branches/Version-1_0-branch/property/inc/class.sotts.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.sotts.inc.php
2010-10-13 16:57:40 UTC (rev 6491)
+++ branches/Version-1_0-branch/property/inc/class.sotts.inc.php
2010-10-13 17:00:49 UTC (rev 6492)
@@ -74,8 +74,8 @@
$cat_id = isset($data['cat_id']) &&
$data['cat_id'] ? $data['cat_id']:0;
$district_id = isset($data['district_id']) &&
$data['district_id'] ? $data['district_id']:0;
$allrows =
isset($data['allrows'])?$data['allrows']:'';
- $start_date =
isset($data['start_date'])?$data['start_date']:'';
- $end_date =
isset($data['end_date'])?$data['end_date']:'';
+ $start_date = isset($data['start_date']) &&
$data['start_date'] ? (int)$data['start_date'] : 0;
+ $end_date = isset($data['end_date']) &&
$data['end_date'] ? (int)$data['end_date'] : 0;
$external =
isset($data['external'])?$data['external']:'';
$dry_run = isset($data['dry_run']) ?
$data['dry_run'] : '';
$new = isset($data['new']) ?
$data['new'] : '';
@@ -278,6 +278,8 @@
if ($start_date)
{
+ $end_date = $end_date + 3600 * 16 +
phpgwapi_datetime::user_timezone();
+ $start_date = $start_date - 3600 * 8 +
phpgwapi_datetime::user_timezone();
$filtermethod .= " $where
fm_tts_tickets.entry_date >= $start_date AND fm_tts_tickets.entry_date <=
$end_date ";
$where= 'AND';
}
@@ -491,7 +493,7 @@
if (! $this->db->f('cnt'))
{
$this->db->query("INSERT INTO fm_tts_views
(id,account_id,time) values ({$id},'"
- .
$GLOBALS['phpgw_info']['user']['account_id'] . "','" .
phpgwapi_datetime::user_localtime() . "')",__LINE__,__FILE__);
+ .
$GLOBALS['phpgw_info']['user']['account_id'] . "','" . time() .
"')",__LINE__,__FILE__);
}
}
@@ -552,7 +554,7 @@
$this->db->db_addslashes($ticket['details']),
$ticket['location_code'],
$address,
- phpgwapi_datetime::user_localtime(),
+ time(),
$ticket['finnish_date'],
$ticket['contact_id'],
1
@@ -592,7 +594,7 @@
if($this->db->transaction_commit())
{
- $this->historylog->add('O',$id,
phpgwapi_datetime::user_localtime(),'');
+ $this->historylog->add('O',$id, time(),'');
if($ticket['finnish_date'])
{
$this->historylog->add('IF',$id,$ticket['finnish_date'],'');
Modified: branches/Version-1_0-branch/property/inc/class.soworkorder.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soworkorder.inc.php
2010-10-13 16:57:40 UTC (rev 6491)
+++ branches/Version-1_0-branch/property/inc/class.soworkorder.inc.php
2010-10-13 17:00:49 UTC (rev 6492)
@@ -27,6 +27,8 @@
* @version $Id$
*/
+ phpgw::import_class('phpgwapi.datetime');
+
/**
* Description
* @package property
@@ -130,8 +132,8 @@
$order = isset($data['order']) ?
$data['order'] : '';
$cat_id = isset($data['cat_id']) &&
$data['cat_id'] ? $data['cat_id'] : 0;
$status_id = isset($data['status_id']) &&
$data['status_id'] ? $data['status_id'] : 0;
- $start_date = isset($data['start_date']) ?
$data['start_date'] : '';
- $end_date = isset($data['end_date']) ?
$data['end_date'] : '';
+ $start_date = isset($data['start_date']) &&
$data['start_date'] ? (int)$data['start_date'] : 0;
+ $end_date = isset($data['end_date']) &&
$data['end_date'] ? (int)$data['end_date'] : 0;
$allrows = isset($data['allrows']) ?
$data['allrows'] : '';
$wo_hour_cat_id = isset($data['wo_hour_cat_id']) ?
$data['wo_hour_cat_id'] : '';
$b_group = isset($data['b_group']) ?
$data['b_group'] : '';
@@ -429,6 +431,9 @@
if ($start_date)
{
+ $end_date = $end_date + 3600 * 16 +
phpgwapi_datetime::user_timezone();
+ $start_date = $start_date - 3600 * 8 +
phpgwapi_datetime::user_timezone();
+
$filtermethod .= " $where
fm_workorder.start_date >= $start_date AND fm_workorder.start_date <= $end_date
";
$where= 'AND';
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [6492] merge 6489:6491 from trunk,
Sigurd Nes <=