View | Details | Raw Unified | Return to bug 40528 | Differences between
and this patch

Collapse All | Expand All

(-)a/management/univention-management-console/src/univention/management/console/module.py (-5 / +13 lines)
 Lines 252-257   def merge(self, other): Link Here 
252
				self.commands.append(command)
252
				self.commands.append(command)
253
253
254
254
255
class Link(Module):
256
257
	@property
258
	def id(self):
259
		return '__link-%s' % super(Link, self).id
260
261
255
class XML_Definition(ET.ElementTree):
262
class XML_Definition(ET.ElementTree):
256
263
257
	'''container for the interface description of a module'''
264
	'''container for the interface description of a module'''
 Lines 278-287   def keywords(self): Link Here 
278
285
279
	@property
286
	@property
280
	def id(self):
287
	def id(self):
281
		if self.root.tag == 'link':
288
		return self.root.get('id')
282
			return '__link-%s' % self.root.get('id')
283
		else:
284
			return self.root.get('id')
285
289
286
	@property
290
	@property
287
	def priority(self):
291
	def priority(self):
 Lines 340-346   def commands(self): Link Here 
340
			yield command.get('name')
344
			yield command.get('name')
341
345
342
	def get_module(self):
346
	def get_module(self):
343
		return Module(self.id, self.name, self.url, self.description, self.icon, self.categories, self.flavors, priority=self.priority, keywords=self.keywords)
347
		cls = {
348
			'module': Module,
349
			'link': Link,
350
		}.get(self.root.tag, Module)
351
		return cls(self.id, self.name, self.url, self.description, self.icon, self.categories, self.flavors, priority=self.priority, keywords=self.keywords)
344
352
345
	def get_flavor(self, name):
353
	def get_flavor(self, name):
346
		'''Retrieves details of a flavor'''
354
		'''Retrieves details of a flavor'''

Return to bug 40528