js: et2_widget_planner.js et2_widget_view.js

nathangray 2016-04-04 21:36:44 UTC #1

Author: nathangray
New Revision: 55619

URL: http://svn.stylite.de/viewvc/egroupware?rev=55619&view=rev
Log:
Fix missing calendar owner labels when they weren’t in the default options

Modified:
trunk/calendar/js/et2_widget_planner.js
trunk/calendar/js/et2_widget_view.js

Modified: trunk/calendar/js/et2_widget_planner.js
URL: http://svn.stylite.de/viewvc/egroupware/trunk/calendar/js/et2_widget_planner.js?rev=55619&r1=55618&r2=55619&view=diff

— trunk/calendar/js/et2_widget_planner.js (original)
+++ trunk/calendar/js/et2_widget_planner.js Mon Apr 4 23:36:44 2016
@@ -324,42 +324,11 @@
// Labels for the rows
row_labels: function() {
var labels = [];

  		var accounts = egw.accounts();
  		var already_added = [];
  		for(var i = 0; i < this.options.owner.length; i++)
  		{
  			var user = this.options.owner[i];

```
  			if(parseInt(user) === 0)
```
```
  			{
```
```
  				// 0 means current user
```
```
  				user = egw.user('account_id');
```
```
  			}
```
```
  			if (isNaN(user))		// resources
```
```
  			{
```
```
  				var planner = this;
```

  				var label = egw.link_title('resources',user.match(/\d+/)[0],function(name) {

  					for(var j = 0; j < labels.length; j++)

```
  					{
```
```
  						if(labels[j].id == this)
```
```
  						{
```
```
  							labels[j].label = name;
```
```
  							break;
```
```
  						}
```
```
  					}
```

  					var row = planner.getWidgetById('planner_row_'+this);

```
  					if(row && row.set_label)
```
```
  					{
```
```
  						row.set_label(name);
```
```
  					}
```
```
  				},user);
```
```
  				if(!label) label = user;
```

  				if(already_added.indexOf(user) < 0)

```
  				{
```

  					labels.push({id: user, label: label, data: {participants:user,owner:''}});

```
  					already_added.push(''+user);
```
```
  				}
```
```
  			}
```
```
  			else if (user < 0)	// groups
```

  			if (user < 0)	// groups
  			{
  				egw.accountData(user,'account_fullname',true,function(result) {
  					for(var id in result)

@@ -374,15 +343,11 @@
}
else // users
{

```
  				user = parseInt(user);
```

  				for(var j = 0; j < accounts.length && already_added.indexOf(''+user) < 0; j++)

  				var label = this._get_owner_name(user);

  				if(already_added.indexOf(user) < 0)
  				{

```
  					if(accounts[j].value === user)
```
```
  					{
```

  						labels.push({id: user, label: accounts[j].label, data: {participants:user,owner:user}});

```
  						already_added.push(''+user);
```
```
  						break;
```
```
  					}
```

  					labels.push({id: user, label: label, data: {participants:user,owner:''}});

  					already_added.push(''+user);
  				}
  			}
  		}

Modified: trunk/calendar/js/et2_widget_view.js
URL: http://svn.stylite.de/viewvc/egroupware/trunk/calendar/js/et2_widget_view.js?rev=55619&r1=55618&r2=55619&view=diff

— trunk/calendar/js/et2_widget_view.js (original)
+++ trunk/calendar/js/et2_widget_view.js Mon Apr 4 23:36:44 2016
@@ -308,28 +308,13 @@
* @memberOf et2_calendar_view
*/
_get_owner_name: function _get_owner_name(user) {

  var label = undefined;
  if(parseInt(user) === 0)
  {
  	// 0 means current user
  	user = egw.user('account_id');
  }

  if (isNaN(user)) // resources or contact

```
  {
```
```
  	var application = 'home-accounts';
```
```
  	switch(user[0])
```
```
  	{
```
```
  		case 'c':
```
```
  			application = 'addressbook';
```
```
  			break;
```
```
  		case 'r':
```
```
  			application = 'resources';
```
```
  			break;
```
```
  	}
```

  	// This might not have a value right away

  	// send an empty function or it won't ask the server

  	user = egw.link_title(application,user.match(/\d+/)[0], function() {}, this);

```
  }
```
```
  else	// users
```

  if (!isNaN(user))
  {
  	user = parseInt(user);
  	var accounts = egw.accounts('both');

@@ -337,12 +322,21 @@
{
if(accounts[j].value === user)
{

```
  			user = accounts[j].label;
```

  			label = accounts[j].label;
  			break;
  		}
  	}
  }

```
  return user;
```

```
  if(typeof label === 'undefined')
```
```
  {
```

  	// Not found?  Ask the sidebox owner widget, it gets updated

  	if(app.calendar && app.calendar.sidebox_et2 && app.calendar.sidebox_et2.getWidgetById('owner'))

```
  	{
```

  		user = app.calendar.sidebox_et2.getWidgetById('owner').options.select_options.find(function(element) {return element.id == user;}) || {};

```
  		label = user.label;
```
```
  	}
```
```
  }
```
```
  return label;
```
},

/**

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