extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-23 23:29:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

- Fix missing option check to work with options sent as an in-order array (label,value), fixes some custom fields not being properly set.

Browse Source 
- Fix links to accounts (home-accounts) would not open properly when you click on them
This commit is contained in:
Nathan Gray 2015-10-06 19:23:51 +00:00
parent 9e1bd4fcb8
commit a2af10dd14
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etemplate/js/et2_widget_selectbox.js
View File

@ -490,7 +490,9 @@ var et2_selectbox = et2_inputWidget.extend(
{ {
if(_value && jQuery("option[value='"+_value+"']", this.input).prop("selected", true).length == 0) if(_value && jQuery("option[value='"+_value+"']", this.input).prop("selected", true).length == 0)
{ {
if(this.options.select_options[_value]) if(this.options.select_options[_value] ||
this.options.select_options.filter &&
this.options.select_options.filter(function(value) {return value == _value;}))
{ {
// Options not set yet? Do that now, which will try again. // Options not set yet? Do that now, which will try again.
return this.set_select_options(this.options.select_options); return this.set_select_options(this.options.select_options);

2
phpgwapi/inc/class.egw_link.inc.php
View File

@ -143,7 +143,7 @@ class egw_link extends solink
'icon' => 'addressbook/accounts', 'icon' => 'addressbook/accounts',
'query' => 'accounts::link_query', 'query' => 'accounts::link_query',
'title' => 'common::grab_owner_name', 'title' => 'common::grab_owner_name',
'view' => array('menuaction'=>'addressbook.addressbook_ui.view'), 'view' => array('menuaction'=>'addressbook.addressbook_ui.view','ajax'=>'true'),
'view_id' => 'account_id' 'view_id' => 'account_id'
), ),
'home' => array( 'home' => array(