etemplate: et2_extension_nextmatch_controller.js et2_widget_selectbox.js

ralfbecker_sf 2016-04-05 15:05:31 UTC #1

Author: ralfbecker
New Revision: 55630

URL: http://svn.stylite.de/viewvc/egroupware?rev=55630&view=rev
Log:
fix client-side nextmatch to use select-options from get_rows data for select-widgets in newly rendered rows

Modified:
trunk/egroupware/api/js/etemplate/et2_extension_nextmatch_controller.js
trunk/egroupware/api/js/etemplate/et2_widget_selectbox.js

Modified: trunk/egroupware/api/js/etemplate/et2_extension_nextmatch_controller.js
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/js/etemplate/et2_extension_nextmatch_controller.js?rev=55630&r1=55629&r2=55630&view=diff

— trunk/egroupware/api/js/etemplate/et2_extension_nextmatch_controller.js (original)
+++ trunk/egroupware/api/js/etemplate/et2_extension_nextmatch_controller.js Tue Apr 5 17:05:31 2016
@@ -565,6 +565,8 @@
{
this.self._rowProvider.categories = null;
}

  			// update array mgr so select widgets in row also get refreshed options

  			nm.getParent().getArrayMgr('sel_options').data[id] = _response.rows.sel_options[id];
  		}
  	}
  	else

Modified: trunk/egroupware/api/js/etemplate/et2_widget_selectbox.js
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/js/etemplate/et2_widget_selectbox.js?rev=55630&r1=55629&r2=55630&view=diff

— trunk/egroupware/api/js/etemplate/et2_widget_selectbox.js (original)
+++ trunk/egroupware/api/js/etemplate/et2_widget_selectbox.js Tue Apr 5 17:05:31 2016
@@ -165,7 +165,9 @@
typeof _attrs.select_options == ‘undefined’ || _attrs.select_options === null
)
{

```
  	return;
```

  	// do not return inside nextmatch, as get_rows data might have changed select_options

  	// for performance reasons we only do it for first row, which should have id "0[...]"

  	if (this.getParent()._type != 'rowWidget' || !_attrs.id || _attrs.id[0] != '0') return;
  }

  var sel_options = et2_selectbox.find_select_options(this, _attrs['select_options'], _attrs);

@@ -1335,7 +1337,7 @@
* @param {array} _attrs array to add further attributes to
*/
getDetachedAttributes: function(_attrs) {

```
  _attrs.push("value");
```

```
  _attrs.push("value",'select_options');
```
},

/**
@@ -1360,6 +1362,10 @@
*/
setDetachedAttributes: function(_nodes, _values) {
this.span = jQuery(_nodes[0]);

  if (typeof _values.select_options != 'undefined')

```
  {
```

  	this.set_select_options(_values.select_options);

  }
  this.set_value(_values["value"]);

}
});}).call(this);

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