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

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/groups/group.py (-13 / +2 lines)
 Lines 246-251   mapping.register('sambaGroupType', 'sambaGroupType', None, univention.admin.mapp Link Here 
246 
mapping.register('mailAddress', 'mailPrimaryAddress', None, univention.admin.mapping.ListToString)
 246 
mapping.register('mailAddress', 'mailPrimaryAddress', None, univention.admin.mapping.ListToString)
247 
mapping.register('adGroupType', 'univentionGroupType', None, univention.admin.mapping.ListToString)
 247 
mapping.register('adGroupType', 'univentionGroupType', None, univention.admin.mapping.ListToString)
248 
mapping.register('sambaPrivileges', 'univentionSambaPrivilegeList')
 248 
mapping.register('sambaPrivileges', 'univentionSambaPrivilegeList')
249 
mapping.register('allowedEmailUsers', 'univentionAllowedEmailUsers')
250 
mapping.register('allowedEmailGroups', 'univentionAllowedEmailGroups')
249 

          251
          

        

        

          250
          

          252
          

        

        

          251
          
def _case_insensitive_in_list(dn, list):

          253
          
def _case_insensitive_in_list(dn, list):

        

  

    

    

       Lines 374-382
      class object(univention.admin.handlers.simpleLdap): 
    
  Link Here 
    

  

        

          374
          
			time_end = time.time()

          376
          
			time_end = time.time()

        

        

          375
          
			ud.debug(ud.ADMIN, ud.INFO, 'groups/group: open(): member check duration: %1.2fs' % (time_end - time_start))

          377
          
			ud.debug(ud.ADMIN, ud.INFO, 'groups/group: open(): member check duration: %1.2fs' % (time_end - time_start))

        

        

          376
          

          378
          

        

            

              377
              
			self['allowedEmailUsers'] = self.oldattr.get('univentionAllowedEmailUsers', [])

              
              
            

            

              378
              
			self['allowedEmailGroups'] = self.oldattr.get('univentionAllowedEmailGroups', [])

            

            

              379
              

            

        

          380
          
			self.save()

          379
          
			self.save()

        

        

          381
          

          380
          

        

        

          382
          
	def fast_member_add(self, memberdnlist, uidlist):

          381
          
	def fast_member_add(self, memberdnlist, uidlist):

        

  

    

    

       Lines 617-632
      class object(univention.admin.handlers.simpleLdap): 
    
  Link Here 
    

  

        

          617
          
			if memberUidAdd:

          616
          
			if memberUidAdd:

        

        

          618
          
				ml.append(('memberUid', '', memberUidAdd))

          617
          
				ml.append(('memberUid', '', memberUidAdd))

        

        

          619
          

          618
          

        

            

              620
              
		oldEmailUsers = self.oldinfo.get('allowedEmailUsers', [])

              
              
            

            

              621
              
		newEmailUsers = self.info.get('allowedEmailUsers', [])

            

            

              622
              
		if set(oldEmailUsers) != set(newEmailUsers):  # compare sets since the order of values does not matter

            

            

              623
              
			ml.append(('univentionAllowedEmailUsers', oldEmailUsers, newEmailUsers))

            

            

              624
              

            

            

              625
              
		oldEmailGroups = self.oldinfo.get('allowedEmailGroups', [])

            

            

              626
              
		newEmailGroups = self.info.get('allowedEmailGroups', [])

            

            

              627
              
		if set(oldEmailGroups) != set(newEmailGroups):  # compare sets since the order of values does not matter

            

            

              628
              
			ml.append(('univentionAllowedEmailGroups', oldEmailGroups, newEmailGroups))

            

            

              629
              

            

        

          630
          
		return ml

          619
          
		return ml

        

        

          631
          

          620
          

        

        

          632
          
	def _ldap_post_create(self):

          621
          
	def _ldap_post_create(self):

        



(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/mail/lists.py
      (-19 / +2 lines)




  

    

    

       Lines 120-138
      mapping.register('name', 'cn', None, univention.admin.mapping.ListToString) 
    
  Link Here 
    

  

        

          120
          
mapping.register('description', 'description', None, univention.admin.mapping.ListToString)

          120
          
mapping.register('description', 'description', None, univention.admin.mapping.ListToString)

        

        

          121
          
mapping.register('members', 'univentionMailMember')

          121
          
mapping.register('members', 'univentionMailMember')

        

        

          122
          
mapping.register('mailAddress', 'mailPrimaryAddress', None, univention.admin.mapping.ListToString)

          122
          
mapping.register('mailAddress', 'mailPrimaryAddress', None, univention.admin.mapping.ListToString)

        

            

              
              
              123
              
mapping.register('allowedEmailUsers', 'univentionAllowedEmailUsers')

            

            

              124
              
mapping.register('allowedEmailGroups', 'univentionAllowedEmailGroups')

            

        

          123
          

          125
          

        

        

          124
          

          126
          

        

        

          125
          
class object(univention.admin.handlers.simpleLdap):

          127
          
class object(univention.admin.handlers.simpleLdap):

        

        

          126
          
	module = module

          128
          
	module = module

        

        

          127
          

          129
          

        

            

              128
              
	def open(self):

              
              
            

            

              129
              
		univention.admin.handlers.simpleLdap.open(self)

            

            

              130
              

            

            

              131
              
		self['allowedEmailUsers'] = self.oldattr.get('univentionAllowedEmailUsers', [])

            

            

              132
              
		self['allowedEmailGroups'] = self.oldattr.get('univentionAllowedEmailGroups', [])

            

            

              133
              

            

            

              134
              
		self.save()

            

            

              135
              

            

        

          136
          
	def _ldap_post_create(self):

          130
          
	def _ldap_post_create(self):

        

        

          137
          
		if self['mailAddress']:

          131
          
		if self['mailAddress']:

        

        

          138
          
			univention.admin.allocators.confirm(self.lo, self.position, 'mailPrimaryAddress', self['mailAddress'])

          132
          
			univention.admin.allocators.confirm(self.lo, self.position, 'mailPrimaryAddress', self['mailAddress'])

        

  

    

    

       Lines 167-183
      class object(univention.admin.handlers.simpleLdap): 
    
  Link Here 
    

  

        

          167
          
					raise univention.admin.uexceptions.mailAddressUsed

          161
          
					raise univention.admin.uexceptions.mailAddressUsed

        

        

          168
          

          162
          

        

        

          169
          
		ml = univention.admin.handlers.simpleLdap._ldap_modlist(self)

          163
          
		ml = univention.admin.handlers.simpleLdap._ldap_modlist(self)

        

            

              170
              

              
              
            

            

              171
              
		oldEmailUsers = self.oldinfo.get('allowedEmailUsers', [])

            

            

              172
              
		newEmailUsers = self.info.get('allowedEmailUsers', [])

            

            

              173
              
		if oldEmailUsers != newEmailUsers:

            

            

              174
              
			ml.append(('univentionAllowedEmailUsers', oldEmailUsers, newEmailUsers))

            

            

              175
              

            

            

              176
              
		oldEmailGroups = self.oldinfo.get('allowedEmailGroups', [])

            

            

              177
              
		newEmailGroups = self.info.get('allowedEmailGroups', [])

            

            

              178
              
		if oldEmailGroups != newEmailGroups:

            

            

              179
              
			ml.append(('univentionAllowedEmailGroups', oldEmailGroups, newEmailGroups))

            

            

              180
              

            

        

          181
          
		return ml

          164
          
		return ml

        

        

          182
          

          165
          

        

        

          183
          

          166
          

        






  

  Return to bug 50239