Attachment #8240 for bug #43048

View | Details | Raw Unified | Return to bug 43048
Collapse All | Expand All




			if (this._tree) {
				// the tree view (navigation, DHCP, DNS) might contain containers (e.g. also underneath of a superordinate!)
				// we need to set the currently selected container if it's not a superordinate
				var path = lang.clone(this._tree.get('path'));
				if (path.length) {
					values.container = path[path.length - 1].id;
					values.superordinate = path[path.length - 1].id;
					if (!path[path.length -1].$isSuperordinate$) {
						// a regular container is selected in the tree (which might be underneath of a superordinate)
						delete values.superordinate;
					}
				}
			}
			if (values.superordinate) {

Lines 530-536 def _thread(request): Link Here

(-)a/management/univention-management-console-module-udm/umc/python/udm/__init__.py (-1 / +2 lines)
530	if mod is not None:	530	if mod is not None:
531	MODULE.info('Found UDM module %r for superordinate %s' % (mod.name, superordinate))	531	MODULE.info('Found UDM module %r for superordinate %s' % (mod.name, superordinate))
532	superordinate = mod.get(superordinate)	532	superordinate = mod.get(superordinate)
533	request.options['container'] = superordinate.dn	533	if not request.options.get('container'):
		534	request.options['container'] = superordinate.dn
534	else:	535	else:
535	raise SuperordinateDoesNotExist(superordinate)	536	raise SuperordinateDoesNotExist(superordinate)
536		537

Return to bug 43048

Lines 1391-1404 define([ Link Here

(-)a/management/univention-management-console-module-udm/umc/js/udm.js (-6 / +1 lines)
1391	if (this._tree) {	1391	if (this._tree) {
1392	// the tree view (navigation, DHCP, DNS) might contain containers (e.g. also underneath of a superordinate!)	1392	// the tree view (navigation, DHCP, DNS) might contain containers (e.g. also underneath of a superordinate!)
1393	// we need to set the currently selected container if it's not a superordinate	1393	// we need to set the currently selected container if it's not a superordinate
1394	var path = this._tree.get('path');	1394	var path = lang.clone(this._tree.get('path'));
1395	if (path.length) {	1395	if (path.length) {
1396	values.container = path[path.length - 1].id;	1396	values.container = path[path.length - 1].id;
1397	values.superordinate = path[path.length - 1].id;
1398	if (!path[path.length -1].$isSuperordinate$) {
1399	// a regular container is selected in the tree (which might be underneath of a superordinate)
1400	delete values.superordinate;
1401	}
1402	}	1397	}
1403	}	1398	}
1404	if (values.superordinate) {	1399	if (values.superordinate) {