[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [6490] - Updated the limit functionality for delegate
|
From: |
Joakim Hop |
|
Subject: |
[Fmsystem-commits] [6490] - Updated the limit functionality for delegates to be controlled by a setting parameter |
|
Date: |
Wed, 13 Oct 2010 12:31:32 +0000 |
Revision: 6490
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6490
Author: joakim_hop
Date: 2010-10-13 12:31:32 +0000 (Wed, 13 Oct 2010)
Log Message:
-----------
- Updated the limit functionality for delegates to be controlled by a setting
parameter
- fixed helpdesk so that all records is shown by default
Modified Paths:
--------------
trunk/frontend/inc/class.uidelegates.inc.php
trunk/frontend/inc/class.uihelpdesk.inc.php
trunk/frontend/setup/phpgw_no.lang
trunk/frontend/templates/base/config.tpl
trunk/frontend/templates/base/delegate.xsl
Modified: trunk/frontend/inc/class.uidelegates.inc.php
===================================================================
--- trunk/frontend/inc/class.uidelegates.inc.php 2010-10-13 12:26:42 UTC
(rev 6489)
+++ trunk/frontend/inc/class.uidelegates.inc.php 2010-10-13 12:31:32 UTC
(rev 6490)
@@ -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: trunk/frontend/inc/class.uihelpdesk.inc.php
===================================================================
--- trunk/frontend/inc/class.uihelpdesk.inc.php 2010-10-13 12:26:42 UTC (rev
6489)
+++ trunk/frontend/inc/class.uihelpdesk.inc.php 2010-10-13 12:31:32 UTC (rev
6490)
@@ -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: trunk/frontend/setup/phpgw_no.lang
===================================================================
--- trunk/frontend/setup/phpgw_no.lang 2010-10-13 12:26:42 UTC (rev 6489)
+++ trunk/frontend/setup/phpgw_no.lang 2010-10-13 12:31:32 UTC (rev 6490)
@@ -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: trunk/frontend/templates/base/config.tpl
===================================================================
--- trunk/frontend/templates/base/config.tpl 2010-10-13 12:26:42 UTC (rev
6489)
+++ trunk/frontend/templates/base/config.tpl 2010-10-13 12:31:32 UTC (rev
6490)
@@ -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: trunk/frontend/templates/base/delegate.xsl
===================================================================
--- trunk/frontend/templates/base/delegate.xsl 2010-10-13 12:26:42 UTC (rev
6489)
+++ trunk/frontend/templates/base/delegate.xsl 2010-10-13 12:31:32 UTC (rev
6490)
@@ -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>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [6490] - Updated the limit functionality for delegates to be controlled by a setting parameter,
Joakim Hop <=