diff --git a/management/univention-directory-manager-modules/modules/univention/admin/handlers/__init__.py b/management/univention-directory-manager-modules/modules/univention/admin/handlers/__init__.py index 0e2f308..6c4a1c3 100644 --- a/management/univention-directory-manager-modules/modules/univention/admin/handlers/__init__.py +++ b/management/univention-directory-manager-modules/modules/univention/admin/handlers/__init__.py @@ -1149,9 +1149,6 @@ def open( self ): self.ip_alredy_requested = 0 self.ip_freshly_set = False - self.open_warning = None - open_warnings = [ ] - self.__multiip = False if len ( self[ 'mac' ] ) > 1 or len( self[ 'ip' ] ) > 1: self.__multiip = True @@ -1279,11 +1276,6 @@ def open( self ): result=self.lo.search(base=self.lo.base, filter=filter_format('(&(objectclass=univentionGroup)(uniqueMember=%s))', [self.dn]), attr=['dn']) self['groups'] = [(x[0]) for x in result] - if len( open_warnings ) > 0: - self.open_warning = '' - for warn in open_warnings: - self.open_warning += '\n'+warn - if 'name' in self.info and 'domain' in self.info: self.info[ 'fqdn' ] = '%s.%s' % ( self[ 'name' ], self[ 'domain' ] ) diff --git a/management/univention-directory-manager-modules/modules/univention/admincli/admin.py b/management/univention-directory-manager-modules/modules/univention/admincli/admin.py index 7adfc49..491d7c3 100755 --- a/management/univention-directory-manager-modules/modules/univention/admincli/admin.py +++ b/management/univention-directory-manager-modules/modules/univention/admincli/admin.py @@ -718,8 +718,6 @@ def _doit(arglist): object.options=parsed_options object.open() - if hasattr(object,' open_warning') and object.open_warning: - out.append('WAR NING:%s'%object.open_warning) exists=0 try: out.extend(object_input(module, object, input, append=append)) @@ -840,8 +838,6 @@ def _doit(arglist): return out + ["OPERATION FAILED"] object.open() - if hasattr(object,'open_warning') and object.open_warning: - out.append('WARNING:%s'%object.open_warning) if action == 'move': if hasattr(module,'operations') and module.operations: @@ -961,8 +957,6 @@ def _doit(arglist): return out + ["OPERATION FAILED"] object.open() - if hasattr(object,'open_warning') and object.open_warning: - out.append('WARNING:%s'%object.open_warning) if remove_referring and univention.admin.objects.wantsCleanup(object): univention.admin.objects.performCleanup(object) @@ -997,8 +991,6 @@ def _doit(arglist): if (hasattr(module,'virtual') and not module.virtual) or not hasattr(module,'virtual'): object.open() - if hasattr(object,'open_warning') and object.open_warning: - out.append('WARNING: %s'%object.open_warning) for key, value in object.items(): if key == 'sambaLogonHours': # returns a list, which breaks things here