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

(-)umc/python/udm/udm_ldap.py (+7 lines)
 Lines 543-548    Link Here 
543 
				ret.append( key )
 543 
				ret.append( key )
544 
		return ret
 544 
		return ret
545 

          545
          

        

            

              
              
              546
              
	def obj_description( self, obj ):

            

            

              547
              
		description_property_name = ucr.get('directory/manager/web/modules/%s/display' % self.name)

            

            

              548
              
		if description_property_name:

            

            

              549
              
			description_property = self.module.property_descriptions.get(description_property_name)

            

            

              550
              
			if description_property:

            

            

              551
              
				return description_property.syntax.tostring(obj[description_property_name])

            

            

              552
              

            

        

          546
          
	def is_policy_module( self ):

          553
          
	def is_policy_module( self ):

        

        

          547
          
		return self.name.startswith('policies/') and self.name != 'policies/policy'

          554
          
		return self.name.startswith('policies/') and self.name != 'policies/policy'

        

        

          548
          

          555
          

        



(-)umc/python/udm/__init__.py
      (-1 / +2 lines)




  

    

    

       Lines 473-478
       
    
  Link Here 
    

  

        

          473
          
		"""

          473
          
		"""

        

        

          474
          

          474
          

        

        

          475
          
		def _thread( request ):

          475
          
		def _thread( request ):

        

            

              
              
              476
              
			ucr.load()

            

        

          476
          
			module = self._get_module_by_request( request )

          477
          
			module = self._get_module_by_request( request )

        

        

          477
          

          478
          

        

        

          478
          
			superordinate = request.options.get( 'superordinate' )

          479
          
			superordinate = request.options.get( 'superordinate' )

        

  

    

    

       Lines 508-514
       
    
  Link Here 
    

  

        

          508
          
					'$childs$' : module.childs,

          509
          
					'$childs$' : module.childs,

        

        

          509
          
					'objectType' : module.name,

          510
          
					'objectType' : module.name,

        

        

          510
          
					'labelObjectType' : module.subtitle,

          511
          
					'labelObjectType' : module.subtitle,

        

          
            

              511
              
					'name' : udm_objects.description( obj ),


              512
              
					'name' : module.obj_description( obj ) or udm_objects.description( obj ),

            

        

          512
          
					'path' : ldap_dn2path( obj.dn, include_rdn = False )

          513
          
					'path' : ldap_dn2path( obj.dn, include_rdn = False )

        

        

          513
          
					}

          514
          
					}

        

        

          514
          
				if request.options[ 'objectProperty' ] not in ( 'name', 'None' ):

          515
          
				if request.options[ 'objectProperty' ] not in ( 'name', 'None' ):

        






  

  Return to bug 34200