Attachment 9266 Details for Bug 45600

[patch] patch

45600.patch (text/plain), 1.22 KB, created by Florian Best on 2017-10-26 12:07 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Florian Best

Created: 2017-10-26 12:07 CEST

Size: 1.22 KB

patch

obsolete

>commit 214daf63348e7e4f86ea6e2f76258a5fde90d53c
>Author: Florian Best <best@univention.de>
>Date:   Thu Oct 26 11:38:57 2017 +0200
>
>    Bug #45600: fix tree sorting for reverse zones with IPv6 addresses
>
>diff --git a/management/univention-management-console-module-udm/umc/js/udm/TreeModel.js b/management/univention-management-console-module-udm/umc/js/udm/TreeModel.js
>index 972f44a..b4a2cc9 100644
>--- a/management/univention-management-console-module-udm/umc/js/udm/TreeModel.js
>+++ b/management/univention-management-console-module-udm/umc/js/udm/TreeModel.js
>@@ -88,7 +88,14 @@ define([
> 				results = array.map(results, lang.hitch(this, function(obj) {
> 					obj.sortlabel = obj.label;
> 					if (obj.objectType === 'dns/reverse_zone') {
>-						obj.sortlabel = array.map(obj.label.split('.'), function(v) { return sprintf('%03d', v); }).join('.');
>+						// sort IP's numerical
>+						if (~obj.label.indexOf(':')) {
>+							// ipv6
>+							obj.sortlabel = array.map(obj.label.split(':'), function(v) { return sprintf('%05d', parseInt(v, 16)); }).join(':');
>+						} else {
>+							// ipv4
>+							obj.sortlabel = array.map(obj.label.split('.'), function(v) { return sprintf('%03d', v); }).join('.');
>+						}
> 					}
> 					return obj;
> 				}));

Actions: View | Diff

Attachments on bug 45600: 9264 | 9265 | 9266