export_csv_select.xet

nathangray 2016-02-17 16:39:01 UTC #1

Author: nathangray
New Revision: 55052

URL: http://svn.stylite.de/viewvc/egroupware?rev=55052&view=rev
Log:
Use taglist for owner when exporting

Modified:
branches/14.2/calendar/ (props changed)
branches/14.2/calendar/inc/class.calendar_uiforms.inc.php
branches/14.2/calendar/templates/default/export_csv_select.xet

Propchange: branches/14.2/calendar/

— svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 17 17:39:01 2016
@@ -1,2 +1,2 @@
/branches/Stylite-EPL-11.1/calendar:51445
-/trunk/calendar:51362,51371,51376,51394,51400,51456,51474,51540,51547,51569,51573,51592,51596,51614,51812,51817,51844,51846,51848,51850,51901,51936,51953,52018,52020,52060,52085,52114,52116,52118-52119,52216,52249,52252,52284,52338,52347,52362,52408,52413,52416,52434,52463,52469,52506,52509,52536,52593,52658,52672,52695,52834,52931,52933,52971-52973,52983-52988,53008,53084,53087,53116,53118,53120,53146-53147,53155,53176,53178,53194,53258,53421,53496,53500,53534,53536,53577,53620,53668,53703,53724-53725,53742,53752,53755,53757,53759,53781-53782,53833,53836,53870,53892,53894,53900,53910,53950,53989,54152,54154,54201,54225,54263,54273,54275,54287,54335,54367,54376,54557-54558,54691,54741,54754,54887
+/trunk/calendar:51362,51371,51376,51394,51400,51456,51474,51540,51547,51569,51573,51592,51596,51614,51812,51817,51844,51846,51848,51850,51901,51936,51953,52018,52020,52060,52085,52114,52116,52118-52119,52216,52249,52252,52284,52338,52347,52362,52408,52413,52416,52434,52463,52469,52506,52509,52536,52593,52658,52672,52695,52834,52931,52933,52971-52973,52983-52988,53008,53084,53087,53116,53118,53120,53146-53147,53155,53176,53178,53194,53258,53421,53496,53500,53534,53536,53577,53620,53668,53703,53724-53725,53742,53752,53755,53757,53759,53781-53782,53833,53836,53870,53892,53894,53900,53910,53950,53989,54152,54154,54201,54225,54263,54273,54275,54287,54335,54367,54376,54557-54558,54691,54741,54754,54887,55051

Modified: branches/14.2/calendar/inc/class.calendar_uiforms.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/branches/14.2/calendar/inc/class.calendar_uiforms.inc.php?rev=55052&r1=55051&r2=55052&view=diff

— branches/14.2/calendar/inc/class.calendar_uiforms.inc.php (original)
+++ branches/14.2/calendar/inc/class.calendar_uiforms.inc.php Wed Feb 17 17:39:01 2016
@@ -2718,6 +2718,75 @@
}

/**

- Handle ajax searches for owner across all supported resources
- @return Array List of matching results
*/
public function ajax_owner()
{
```
  $query = $_REQUEST['query'];
```

  // Arbitrarily limited to 50 / resource

  $options = ['start' => 0, 'num_rows' => 50];

```
  $results = [];
```
```
  if($query)
```
```
  {
```

  	$resources = array_merge(array('' => $this->bo->resources['']),$this->bo->resources);

  	foreach($resources as $type => $data)

```
  	{
```
```
  		$mapped = array();
```
```
  		$_results = array();
```
```
  		// Handle accounts seperately
```
```
  		if($type == '')
```
```
  		{
```

  			$list = array('accounts', 'owngroups');

```
  			foreach($list as $a_type)
```
```
  			{
```

  				$account_options = $options + array('account_type' => $a_type);

  				$_results += accounts::link_query('',$account_options);

```
  			}
```

  			$_results = array_intersect_key($_results, $GLOBALS['egw']->acl->get_grants('calendar'));

```
  		}
```

  		else if ($data['app'] && egw_link::get_registry($data['app'], 'query'))

```
  		{
```

  			$_results = egw_link::query($data['app'], $query,$options);

```
  		}
```
```
  		if(!$_results) continue;
```

  		$_results = array_unique($_results);

  		foreach($_results as $id => $title)

```
  		{
```
```
  			if($id && $title)
```
```
  			{
```

  				// Magicsuggest uses id, not value.

```
  				$value = [
```
```
  					'id' => $type.$id,
```
```
  					'value'=> $type.$id,
```
```
  					'label' => $title,
```
```
  					'app'	=> lang($data['app'])
```
```
  				];
```
```
  				if(is_array($value['label']))
```
```
  				{
```

  					$value = array_merge($value, $value['label']);

```
  				}
```
```
  				$mapped[] = $value;
```
```
  			}
```
```
  		}
```
```
  		if(count($mapped))
```
```
  		{
```

  			$results = array_merge($results, $mapped);

```
  		}
```
```
  	}
```
```
  }
```

  // switch regular JSON response handling off

  egw_json_request::isJSONRequest(false);

  header('Content-Type: application/json; charset=utf-8');

```
  echo json_encode($results);
```
```
  common::egw_exit();
```
}
/**
- imports a mail as Calendar
- @param array $mailContent = null mail content

Modified: branches/14.2/calendar/templates/default/export_csv_select.xet
URL: http://svn.stylite.de/viewvc/egroupware/branches/14.2/calendar/templates/default/export_csv_select.xet?rev=55052&r1=55051&r2=55052&view=diff

— branches/14.2/calendar/templates/default/export_csv_select.xet (original)
+++ branches/14.2/calendar/templates/default/export_csv_select.xet Wed Feb 17 17:39:01 2016
@@ -38,7 +38,7 @@

  						<listbox type="select-account" id="owner" rows="5" options="both" span="2" class="shorter"/>

  						<taglist id="owner" empty_label="Owner" span="2" class="shorter" autocomplete_url="calendar.calendar_uiforms.ajax_owner.etemplate" allowFreeEntries="false"/>
  					</row>
  				</rows>
  			</grid>

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