|
| From: | Sigurd Nes |
| Subject: | [Fmsystem-commits] [9933] property: check for deined email address on approver |
| Date: | Thu, 30 Aug 2012 08:14:10 +0000 |
Revision: 9933
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9933
Author: sigurdne
Date: 2012-08-30 08:14:09 +0000 (Thu, 30 Aug 2012)
Log Message:
-----------
property: check for deined email address on approver
Modified Paths:
--------------
trunk/property/inc/class.uitts.inc.php
trunk/property/setup/phpgw_no.lang
trunk/property/templates/base/tts.xsl
Modified: trunk/property/inc/class.uitts.inc.php
===================================================================
--- trunk/property/inc/class.uitts.inc.php 2012-08-30 06:39:40 UTC (rev
9932)
+++ trunk/property/inc/class.uitts.inc.php 2012-08-30 08:14:09 UTC (rev
9933)
@@ -2669,22 +2669,26 @@
if ($supervisor_id && $need_approval)
{
$prefs =
$this->bocommon->create_preferences('property',$supervisor_id);
- $supervisor_email[] = array
+ if(isset($prefs['email']) &&
$prefs['email'])
+ {
+ $supervisor_email[] = array
(
'id' =>
$supervisor_id,
'address' =>
$prefs['email'],
);
- if ( isset($prefs['approval_from']) )
+ }
+
+ if ( isset($prefs['approval_from']) &&
$prefs['approval_from'])
{
$prefs2 =
$this->bocommon->create_preferences('property', $prefs['approval_from']);
- if(isset($prefs2['email']))
+ if(isset($prefs2['email']) &&
$prefs2['email'])
{
$supervisor_email[] =
array
- (
- 'id'
=> $prefs['approval_from'],
-
'address' => $prefs2['email'],
- );
+ (
+ 'id' =>
$prefs['approval_from'],
+ 'address' =>
$prefs2['email'],
+ );
$supervisor_email =
array_reverse($supervisor_email);
}
unset($prefs2);
@@ -3106,6 +3110,7 @@
}
//----------------------------------------------datatable settings--------
+//_debug_array($supervisor_email);die();
$msgbox_data = $this->bocommon->msgbox_data($receipt);
$cat_select =
$this->cats->formatted_xslt_list(array('select_name' =>
'values[cat_id]','selected' => $this->cat_id,'use_acl' =>
$this->_category_acl));
$this->cats->set_appname('property','.project');
Modified: trunk/property/setup/phpgw_no.lang
===================================================================
--- trunk/property/setup/phpgw_no.lang 2012-08-30 06:39:40 UTC (rev 9932)
+++ trunk/property/setup/phpgw_no.lang 2012-08-30 08:14:09 UTC (rev 9933)
@@ -113,6 +113,7 @@
add request for this project property no Legg til behov til
dette prosjektet
addressmasters common no AddresseMaster
address property no Adresse
+address not defined property no Adresse er ikke definert
adds a new project - then a new workorder property no legger
til nytt prosjekt - så bestilling
adds a new workorder to an existing project property no legger
til ny bestilling til eksisterende prosjekt
add selected request to project property no Legg valgte
tiltak til prosjektet
Modified: trunk/property/templates/base/tts.xsl
===================================================================
--- trunk/property/templates/base/tts.xsl 2012-08-30 06:39:40 UTC (rev
9932)
+++ trunk/property/templates/base/tts.xsl 2012-08-30 08:14:09 UTC (rev
9933)
@@ -1333,22 +1333,30 @@
<xsl:value-of
select="php:function('lang', 'ask for approval')"/>
</td>
<td>
-
<table>
-
<xsl:for-each
select="value_approval_mail_address">
-
<tr>
-
<td>
-
<input
type="checkbox" name="values[approval][{id}]" value="{address}">
-
<xsl:attribute name="title">
-
<xsl:value-of select="php:function('lang', 'ask for approval')"/>
-
</xsl:attribute>
-
</input>
-
</td>
-
<td
valign="top">
-
<xsl:value-of
select="address"/>
-
</td>
-
</tr>
-
</xsl:for-each>
-
</table>
+
+
<xsl:choose>
+
<xsl:when
test="value_approval_mail_address!=''">
+
<table>
+
<xsl:for-each
select="value_approval_mail_address">
+
<tr>
+
<td>
+
<input type="checkbox" name="values[approval][{id}]" value="{address}">
+
<xsl:attribute name="title">
+
<xsl:value-of select="php:function('lang', 'ask for approval')"/>
+
</xsl:attribute>
+
</input>
+
</td>
+
<td
valign="top">
+
<xsl:value-of select="address"/>
+
</td>
+
</tr>
+
</xsl:for-each>
+
</table>
+
</xsl:when>
+
<xsl:otherwise>
+
<b><xsl:value-of
select="php:function('lang', 'address not defined')"/></b>
+
</xsl:otherwise>
+
</xsl:choose>
</td>
</tr>
</xsl:when>
| [Prev in Thread] | Current Thread | [Next in Thread] |