Attachment 8240 Details for Bug 43048 – patch

[patch] patch

43048.patch (text/plain), 1.79 KB, created by Florian Best on 2016-11-24 14:26:09 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Florian Best

Created: 2016-11-24 14:26:09 CET

Size: 1.79 KB

patch

obsolete

>diff --git a/management/univention-management-console-module-udm/umc/js/udm.js b/management/univention-management-console-module-udm/umc/js/udm.js
>index 08d5238..8498f36 100644
>--- a/management/univention-management-console-module-udm/umc/js/udm.js
>+++ b/management/univention-management-console-module-udm/umc/js/udm.js
>@@ -1391,14 +1391,9 @@ define([
> 			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 = this._tree.get('path');
>+				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) {
>diff --git a/management/univention-management-console-module-udm/umc/python/udm/__init__.py b/management/univention-management-console-module-udm/umc/python/udm/__init__.py
>index 3ed3460..f42446e 100644
>--- a/management/univention-management-console-module-udm/umc/python/udm/__init__.py
>+++ b/management/univention-management-console-module-udm/umc/python/udm/__init__.py
>@@ -530,7 +530,8 @@ def _thread(request):
> 				if mod is not None:
> 					MODULE.info('Found UDM module %r for superordinate %s' % (mod.name, superordinate))
> 					superordinate = mod.get(superordinate)
>-					request.options['container'] = superordinate.dn
>+					if not request.options.get('container'):
>+						request.options['container'] = superordinate.dn
> 				else:
> 					raise SuperordinateDoesNotExist(superordinate)
>

Actions: View | Diff

Attachments on bug 43048: 8240