Attachment #8138 for bug #41204

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

Lines 500-506 define([ Link Here

(-)a/base/univention-system-setup/umc/js/setup.js (-1 / +5 lines)
500	var confirmMessage = '<p>' + _('The following changes will be applied to the system:') + '</p><ul style="max-height:200px; overflow:auto;">';	500	var confirmMessage = '<p>' + _('The following changes will be applied to the system:') + '</p><ul style="max-height:200px; overflow:auto;">';
501	array.forEach(summaries, function(idesc) {	501	array.forEach(summaries, function(idesc) {
502	if (idesc.showConfirm) {	502	if (idesc.showConfirm) {
503	confirmMessage += '<li>' + entities.encode(idesc.description) + ': ' + entities.encode(idesc.values) + '</li>';	503	var values = idesc.values;
		504	if (!idesc.values_html_escaped) {
		505	values = entities.encode(values);
		506	}
		507	confirmMessage += '<li>' + entities.encode(idesc.description) + ': ' + values + '</li>';
504	}	508	}
505	});	509	});
506	confirmMessage += '</ul><p>' + _('Please confirm to apply these changes to the system. This may take some time.') + '</p>';	510	confirmMessage += '</ul><p>' + _('Please confirm to apply these changes to the system. This may take some time.') + '</p>';




	"dojo/_base/array",
	"dojo/store/Memory",
	"dojo/Stateful",
	"dojox/html/entities",
	"umc/tools",
	"umc/modules/setup/types",
	"umc/i18n!umc/modules/setup"
], function(declare, lang, array, Memory, Stateful, entities, tools, types, _) {

	var Device = declare('umc.modules.setup.types.Device', null, {
		constructor: function(props, interfaces) {

			var ip6s = formatIPs(this.ip6);

			if (this.ip4dynamic) {
				back.push(entities.encode(_('Dynamic (DHCP)')));
			}
			if (this.ip6dynamic) {
				back.push(entities.encode(_('Autoconfiguration (SLAAC)')));
			}

			if (ip4s.length && !this.ip4dynamic){
				back.push(entities.encode(_('Static') + ': ' + ip4s.join(', ')));
			}
			if (ip6s.length && !this.ip6dynamic) {
				back.push(entities.encode(_('Static (IPv6)') + ': ' + ip6s.join(', ')));
			}

			return back.join('<br/>');

			if (description) {
				return description;
			}
			return entities.encode(_('Unconfigured'));
		}
	});
	var Ethernet = declare('umc.modules.setup.interfaces.Ethernet', [Device], {});

			if (descr) {
				back.push(descr);
			}
			back.push(entities.encode(_('Bond slaves') + ': ' + this.bond_slaves.join(', ')));

			return back.join('<br/>');
		}

			if (descr) {
				back.push(descr);
			}
			back.push(entities.encode(_('Bridge ports') + ': ' + this.bridge_ports.join(', ')));

			return back.join('<br/>');
		}




	"dojo/_base/lang",
	"dojo/_base/array",
	"dojo/aspect",
	"dojox/html/entities",
	"umc/tools",
	"umc/widgets/Page",
	"umc/widgets/StandbyMixin",

	"umc/modules/setup/Interfaces",
	"umc/i18n!umc/modules/setup",
	"umc/modules/setup/InterfaceWizard"
], function(declare, lang, array, aspect, entities, tools, Page, StandbyMixin, ComboBox, TextBox, MultiInput, Form, InterfaceGrid, Interfaces, _) {
	return declare("umc.modules.setup.NetworkPage", [ Page, StandbyMixin ], {
		// summary:
		//		This class renderes a detail page containing subtabs and form elements

			}, {
				variables: ['interfaces'],
				description: _('Network interfaces'),
				values_html_escaped: true,
				values: this._getInterfaceSummary(vals.interfaces)
			}, {
				variables: ['interfaces/primary'],

				summary += '<li>' + _('Created:') + '<ul>';
				array.forEach(created, function(iface) {
					summary += '<li>';
					summary += entities.encode(iface.name + ' (' + iface.label + '): ');
					summary += iface.getSummary();
					summary += '</li>';
				});

				summary += '<li>' + _('Modified:') + '<ul>';
				array.forEach(modified, function(iface) {
					summary += '<li>';
					summary += entities.encode(iface.name + ' (' + iface.label + '): ');
					summary += iface.getSummary();
					summary += '</li>';
				});

			if (removed.length) {
				summary += '<li>' + _('Removed:') + '<ul>';
				summary += '<li>';
				summary += entities.encode(array.map(removed, function(iface) {
					return iface.name + ' (' + iface.label + ')';
				}).join(', '));
				summary += '</li></ul>';
			}
			summary += '</li>';

Return to bug 41204

Lines 34-43 define([ Link Here

(-)a/base/univention-system-setup/umc/js/setup/Interfaces.js (-8 / +9 lines)
34	"dojo/_base/array",	34	"dojo/_base/array",
35	"dojo/store/Memory",	35	"dojo/store/Memory",
36	"dojo/Stateful",	36	"dojo/Stateful",
		37	"dojox/html/entities",
37	"umc/tools",	38	"umc/tools",
38	"umc/modules/setup/types",	39	"umc/modules/setup/types",
39	"umc/i18n!umc/modules/setup"	40	"umc/i18n!umc/modules/setup"
40	], function(declare, lang, array, Memory, Stateful, tools, types, _) {	41	], function(declare, lang, array, Memory, Stateful, entities, tools, types, _) {
41		42
42	var Device = declare('umc.modules.setup.types.Device', null, {	43	var Device = declare('umc.modules.setup.types.Device', null, {
43	constructor: function(props, interfaces) {	44	constructor: function(props, interfaces) {
Lines 113-129 define([ Link Here
113	var ip6s = formatIPs(this.ip6);	114	var ip6s = formatIPs(this.ip6);
114		115
115	if (this.ip4dynamic) {	116	if (this.ip4dynamic) {
116	back.push(_('Dynamic (DHCP)'));	117	back.push(entities.encode(_('Dynamic (DHCP)')));
117	}	118	}
118	if (this.ip6dynamic) {	119	if (this.ip6dynamic) {
119	back.push(_('Autoconfiguration (SLAAC)'));	120	back.push(entities.encode(_('Autoconfiguration (SLAAC)')));
120	}	121	}
121		122
122	if (ip4s.length && !this.ip4dynamic){	123	if (ip4s.length && !this.ip4dynamic){
123	back.push(_('Static') + ': ' + ip4s.join(', '));	124	back.push(entities.encode(_('Static') + ': ' + ip4s.join(', ')));
124	}	125	}
125	if (ip6s.length && !this.ip6dynamic) {	126	if (ip6s.length && !this.ip6dynamic) {
126	back.push(_('Static (IPv6)') + ': ' + ip6s.join(', '));	127	back.push(entities.encode(_('Static (IPv6)') + ': ' + ip6s.join(', ')));
127	}	128	}
128		129
129	return back.join('<br/>');	130	return back.join('<br/>');
Lines 133-139 define([ Link Here
133	if (description) {	134	if (description) {
134	return description;	135	return description;
135	}	136	}
136	return _('Unconfigured');	137	return entities.encode(_('Unconfigured'));
137	}	138	}
138	});	139	});
139	var Ethernet = declare('umc.modules.setup.interfaces.Ethernet', [Device], {});	140	var Ethernet = declare('umc.modules.setup.interfaces.Ethernet', [Device], {});
Lines 164-170 define([ Link Here
164	if (descr) {	165	if (descr) {
165	back.push(descr);	166	back.push(descr);
166	}	167	}
167	back.push(_('Bond slaves') + ': ' + this.bond_slaves.join(', '));	168	back.push(entities.encode(_('Bond slaves') + ': ' + this.bond_slaves.join(', ')));
168		169
169	return back.join('<br/>');	170	return back.join('<br/>');
170	}	171	}
Lines 186-192 define([ Link Here
186	if (descr) {	187	if (descr) {
187	back.push(descr);	188	back.push(descr);
188	}	189	}
189	back.push(_('Bridge ports') + ': ' + this.bridge_ports.join(', '));	190	back.push(entities.encode(_('Bridge ports') + ': ' + this.bridge_ports.join(', ')));
190		191
191	return back.join('<br/>');	192	return back.join('<br/>');
192	}	193	}

Lines 33-38 define([ Link Here

(-)a/base/univention-system-setup/umc/js/setup/NetworkPage.js (-5 / +7 lines)
33	"dojo/_base/lang",	33	"dojo/_base/lang",
34	"dojo/_base/array",	34	"dojo/_base/array",
35	"dojo/aspect",	35	"dojo/aspect",
		36	"dojox/html/entities",
36	"umc/tools",	37	"umc/tools",
37	"umc/widgets/Page",	38	"umc/widgets/Page",
38	"umc/widgets/StandbyMixin",	39	"umc/widgets/StandbyMixin",
Lines 44-50 define([ Link Here
44	"umc/modules/setup/Interfaces",	45	"umc/modules/setup/Interfaces",
45	"umc/i18n!umc/modules/setup",	46	"umc/i18n!umc/modules/setup",
46	"umc/modules/setup/InterfaceWizard"	47	"umc/modules/setup/InterfaceWizard"
47	], function(declare, lang, array, aspect, tools, Page, StandbyMixin, ComboBox, TextBox, MultiInput, Form, InterfaceGrid, Interfaces, _) {	48	], function(declare, lang, array, aspect, entities, tools, Page, StandbyMixin, ComboBox, TextBox, MultiInput, Form, InterfaceGrid, Interfaces, _) {
48	return declare("umc.modules.setup.NetworkPage", [ Page, StandbyMixin ], {	49	return declare("umc.modules.setup.NetworkPage", [ Page, StandbyMixin ], {
49	// summary:	50	// summary:
50	// This class renderes a detail page containing subtabs and form elements	51	// This class renderes a detail page containing subtabs and form elements
Lines 297-302 define([ Link Here
297	}, {	298	}, {
298	variables: ['interfaces'],	299	variables: ['interfaces'],
299	description: _('Network interfaces'),	300	description: _('Network interfaces'),
		301	values_html_escaped: true,
300	values: this._getInterfaceSummary(vals.interfaces)	302	values: this._getInterfaceSummary(vals.interfaces)
301	}, {	303	}, {
302	variables: ['interfaces/primary'],	304	variables: ['interfaces/primary'],
Lines 337-343 define([ Link Here
337	summary += '<li>' + _('Created:') + '<ul>';	339	summary += '<li>' + _('Created:') + '<ul>';
338	array.forEach(created, function(iface) {	340	array.forEach(created, function(iface) {
339	summary += '<li>';	341	summary += '<li>';
340	summary += iface.name + ' (' + iface.label + '): ';	342	summary += entities.encode(iface.name + ' (' + iface.label + '): ');
341	summary += iface.getSummary();	343	summary += iface.getSummary();
342	summary += '</li>';	344	summary += '</li>';
343	});	345	});
Lines 347-353 define([ Link Here
347	summary += '<li>' + _('Modified:') + '<ul>';	349	summary += '<li>' + _('Modified:') + '<ul>';
348	array.forEach(modified, function(iface) {	350	array.forEach(modified, function(iface) {
349	summary += '<li>';	351	summary += '<li>';
350	summary += iface.name + ' (' + iface.label + '): ';	352	summary += entities.encode(iface.name + ' (' + iface.label + '): ');
351	summary += iface.getSummary();	353	summary += iface.getSummary();
352	summary += '</li>';	354	summary += '</li>';
353	});	355	});
Lines 356-364 define([ Link Here
356	if (removed.length) {	358	if (removed.length) {
357	summary += '<li>' + _('Removed:') + '<ul>';	359	summary += '<li>' + _('Removed:') + '<ul>';
358	summary += '<li>';	360	summary += '<li>';
359	summary += array.map(removed, function(iface) {	361	summary += entities.encode(array.map(removed, function(iface) {
360	return iface.name + ' (' + iface.label + ')';	362	return iface.name + ' (' + iface.label + ')';
361	}).join(', ');	363	}).join(', '));
362	summary += '</li></ul>';	364	summary += '</li></ul>';
363	}	365	}
364	summary += '</li>';	366	summary += '</li>';