holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

first sketch for display all emailadresses popup

Browse Source
This commit is contained in:
Klaus Leithoff 2013-12-03 16:46:32 +00:00
parent 1dd472f567
commit 2b5f986a75
3 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mail/inc/class.mail_bo.inc.php
View File

@ -1189,7 +1189,7 @@ class mail_bo
{ {
if ($k==0) continue; if ($k==0) continue;
//error_log(__METHOD__.__LINE__."-> $k:".array2string($add)); //error_log(__METHOD__.__LINE__."-> $k:".array2string($add));
$retValue['header'][$sortOrder[$uid]]['additional_to_addresses'][$ki]['address'] = self::decode_header($add); $retValue['header'][$sortOrder[$uid]]['additional_to_addresses'][$ki] = self::decode_header($add);
//error_log(__METHOD__.__LINE__.array2string($retValue['header'][$sortOrder[$uid]]['additional_to_addresses'][$ki])); //error_log(__METHOD__.__LINE__.array2string($retValue['header'][$sortOrder[$uid]]['additional_to_addresses'][$ki]));
$ki++; $ki++;
} }
@ -1200,7 +1200,7 @@ class mail_bo
foreach($headerObject['CC'] as $k => $add) foreach($headerObject['CC'] as $k => $add)
{ {
//error_log(__METHOD__.__LINE__."-> $k:".array2string($add)); //error_log(__METHOD__.__LINE__."-> $k:".array2string($add));
$retValue['header'][$sortOrder[$uid]]['cc_addresses'][$ki]['address'] = self::decode_header($add); $retValue['header'][$sortOrder[$uid]]['cc_addresses'][$ki] = self::decode_header($add);
//error_log(__METHOD__.__LINE__.array2string($retValue['header'][$sortOrder[$uid]]['additional_to_addresses'][$ki])); //error_log(__METHOD__.__LINE__.array2string($retValue['header'][$sortOrder[$uid]]['additional_to_addresses'][$ki]));
$ki++; $ki++;
} }

19
mail/js/app.js
View File

@ -551,16 +551,15 @@ app.classes.mail = AppJS.extend(
var buttons = [ var buttons = [
{text: this.egw.lang("Close"), id:"close"} {text: this.egw.lang("Close"), id:"close"}
]; ];
et2_dialog.show_dialog(function(_button_id) var dialog = et2_createWidget("dialog",{
{ // If you use a template, the second parameter will be the value of the template, as if it were submitted.
switch(_button_id) callback: function(button_id, value) {},
{ buttons: buttons,
case 'close': title: dataElem.data.subject,
default: template:"/egroupware/mail/templates/default/displayAllAdresses.xet",
break; value: { content: {displayallAdresses:[{type:this.egw.lang('to'),address:JSON.parse(dataElem.data.additionaltoaddress)[0]}]}, sel_options: {}}
} });
},this.egw.lang("text one"),
dataElem.data.subject, {}, buttons, et2_dialog.WARNING_MESSAGE);
}, },
mail_setMailBody: function(content) { mail_setMailBody: function(content) {

18
mail/templates/default/displayAllAdresses.xet Normal file
View File

@ -0,0 +1,18 @@
<?xml version="1.0"?>
<!-- $Id$ -->
<overlay>
<template id="mail.displayAllAdresses" template="" lang="" group="0" version="1.9.001">
<grid disabled="@no_griddata" id="displayallAdresses">
<columns>
<column width="10%" />
<column width="80%" />
</columns>
<rows>
<row >
<description id="${row}[type]" />
<url-email align="right" id="${row}[address]" readonly='true'/>
</row>
</rows>
</grid>
</template>
</overlay>