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

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/__init__.py (-8 lines)
 Lines 1149-1157   def open( self ): Link Here 
1149
		self.ip_alredy_requested = 0
1149
		self.ip_alredy_requested = 0
1150
		self.ip_freshly_set = False
1150
		self.ip_freshly_set = False
1151
1151
1152
		self.open_warning = None
1153
		open_warnings = [ ]
1154
1155
		self.__multiip = False
1152
		self.__multiip = False
1156
		if len ( self[ 'mac' ] ) > 1 or len( self[ 'ip' ] ) > 1:
1153
		if len ( self[ 'mac' ] ) > 1 or len( self[ 'ip' ] ) > 1:
1157
			self.__multiip = True
1154
			self.__multiip = True
 Lines 1279-1289   def open( self ): Link Here 
1279
			result=self.lo.search(base=self.lo.base, filter=filter_format('(&(objectclass=univentionGroup)(uniqueMember=%s))', [self.dn]), attr=['dn'])
1276
			result=self.lo.search(base=self.lo.base, filter=filter_format('(&(objectclass=univentionGroup)(uniqueMember=%s))', [self.dn]), attr=['dn'])
1280
			self['groups'] = [(x[0]) for x in result]
1277
			self['groups'] = [(x[0]) for x in result]
1281
1278
1282
		if len( open_warnings ) > 0:
1283
			self.open_warning = ''
1284
			for warn in open_warnings:
1285
				self.open_warning += '\n'+warn
1286
1287
		if 'name' in self.info and 'domain' in self.info:
1279
		if 'name' in self.info and 'domain' in self.info:
1288
			self.info[ 'fqdn' ] = '%s.%s' % ( self[ 'name' ], self[ 'domain' ] )
1280
			self.info[ 'fqdn' ] = '%s.%s' % ( self[ 'name' ], self[ 'domain' ] )
1289
1281
(-)a/management/univention-directory-manager-modules/modules/univention/admincli/admin.py (-8 lines)
 Lines 718-725   def _doit(arglist): Link Here 
718
				object.options=parsed_options
718
				object.options=parsed_options
719
719
720
			object.open()
720
			object.open()
721
			if hasattr(object,'	open_warning') and object.open_warning:
722
				out.append('WAR	NING:%s'%object.open_warning)
723
			exists=0
721
			exists=0
724
			try:
722
			try:
725
				out.extend(object_input(module, object, input, append=append))
723
				out.extend(object_input(module, object, input, append=append))
 Lines 840-847   def _doit(arglist): Link Here 
840
			return out + ["OPERATION FAILED"]
838
			return out + ["OPERATION FAILED"]
841
839
842
		object.open()
840
		object.open()
843
		if hasattr(object,'open_warning') and object.open_warning:
844
			out.append('WARNING:%s'%object.open_warning)
845
841
846
		if action == 'move':
842
		if action == 'move':
847
			if hasattr(module,'operations') and module.operations:
843
			if hasattr(module,'operations') and module.operations:
 Lines 961-968   def _doit(arglist): Link Here 
961
			return out + ["OPERATION FAILED"]
957
			return out + ["OPERATION FAILED"]
962
958
963
		object.open()
959
		object.open()
964
		if hasattr(object,'open_warning') and object.open_warning:
965
			out.append('WARNING:%s'%object.open_warning)
966
960
967
		if remove_referring and univention.admin.objects.wantsCleanup(object):
961
		if remove_referring and univention.admin.objects.wantsCleanup(object):
968
				univention.admin.objects.performCleanup(object)
962
				univention.admin.objects.performCleanup(object)
 Lines 997-1004   def _doit(arglist): Link Here 
997
991
998
				if (hasattr(module,'virtual') and not module.virtual) or not hasattr(module,'virtual'):
992
				if (hasattr(module,'virtual') and not module.virtual) or not hasattr(module,'virtual'):
999
					object.open()
993
					object.open()
1000
					if hasattr(object,'open_warning') and object.open_warning:
1001
						out.append('WARNING: %s'%object.open_warning)
1002
					for key, value in object.items():
994
					for key, value in object.items():
1003
						if key == 'sambaLogonHours':
995
						if key == 'sambaLogonHours':
1004
							# returns a list, which breaks things here
996
							# returns a list, which breaks things here

Return to bug 29929