app.js

leithoff 2016-02-25 12:26:50 UTC #1

Author: leithoff
New Revision: 55141

URL: http://svn.stylite.de/viewvc/egroupware?rev=55141&view=rev
Log:
reflect change in filters (additional details/no details) in app.js refreshFilter2Options refreshCatIdOptions

Modified:
trunk/mail/inc/class.mail_ui.inc.php
trunk/mail/js/app.js

Modified: trunk/mail/inc/class.mail_ui.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/mail/inc/class.mail_ui.inc.php?rev=55141&r1=55140&r2=55141&view=diff

— trunk/mail/inc/class.mail_ui.inc.php (original)
+++ trunk/mail/inc/class.mail_ui.inc.php Thu Feb 25 13:26:50 2016
@@ -90,6 +90,7 @@
‘to’ => ‘to’, // lang(‘to’)
‘cc’ => ‘cc’, // lang(‘cc’)
‘text’ => ‘whole message’, // lang(‘whole message’)
+// ‘custom’ => ‘Selected range’,// lang(‘Selected range’)
);

/**

@@ -398,6 +399,7 @@
*/
function index(array $content=null,$msg=null)
{

  //error_log(__METHOD__.__LINE__.array2string($content));
  try	{
  		//error_log(__METHOD__.__LINE__.function_backtrace());
  		if (mail_bo::$debugTimes) $starttime = microtime (true);

@@ -1294,7 +1296,7 @@
$rowsFetched[‘messages’] = null;
$offset = $query[‘start’]+1; // we always start with 1
$maxMessages = $query[‘num_rows’];

  //error_log(__METHOD__.__LINE__.$query['order']);

  //error_log(__METHOD__.__LINE__.array2string($query));
  $sort = ($query['order']=='address'?($toSchema?'toaddress':'fromaddress'):$query['order']);
  if (!empty($query['search']))
  {

@@ -4147,8 +4149,9 @@
}

	$response = egw_json_response::get();

  $response->call('app.mail.mail_refreshFilter2Options',$this->searchTypes);

  $response->call('app.mail.mail_refreshCatIdOptions',$this->searchTypes);
  $response->call('app.mail.mail_refreshFilterOptions',$this->statusTypes);

  $response->call('app.mail.mail_refreshFilter2Options',array(''=>'No details',1=>'Details'));

}

Modified: trunk/mail/js/app.js
URL: http://svn.stylite.de/viewvc/egroupware/trunk/mail/js/app.js?rev=55141&r1=55140&r2=55141&view=diff

— trunk/mail/js/app.js (original)
+++ trunk/mail/js/app.js Thu Feb 25 13:26:50 2016
@@ -405,6 +405,7 @@
// using JSON.stringfy() directly gave a crash in Safari 7.0.4
return this.egw.jsonEncode({
selectedFolder: query_context.filters.selectedFolder || ‘’,

  		cat_id: query_context.filters.cat_id || '',
  		filter: query_context.filters.filter || '',
  		filter2: query_context.filters.filter2 || '',
  		sort: query_context.filters.sort

@@ -1228,7 +1229,7 @@
{
if (k==current) currentexists=true;
}

  if (!currentexists) filter2.set_value('subject');

  if (!currentexists) filter2.set_value('');
  filter2.set_select_options(_data);

@@ -1252,6 +1253,30 @@
if (k==current) currentexists=true;
}
if (!currentexists) filter.set_value(‘any’);

```
  filter.set_select_options(_data);
```
},
/**
- mail_refreshFilterOptions, function to call with appropriate data to refresh the filter options for the active server
- @param {object} _data
*/
mail_refreshCatIdOptions: function(_data)
{

  //alert('mail_refreshFilterOptions');

```
  if (_data == null) return;
```

  if (!this.et2 && !this.checkET2()) return;

  var filter = this.et2.getWidgetById('cat_id');

```
  var current = filter.value;
```
```
  var currentexists=false;
```
```
  for (var k in _data)
```
```
  {
```
```
  	if (k==current) currentexists=true;
```
```
  }
```

  if (!currentexists) filter.set_value('quick');
  filter.set_select_options(_data);

Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=272487151&iu=/4140

eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs