| 
					
				 | 
			
			
				@@ -101,6 +101,10 @@ class info_path(Load): 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		self.data['common']['search_type_id-select-'] = self.service('common').list('device_type') 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		self.data['common']['search_gateway_id-select---farm_id'] = self.service('common').list('device_gateway') 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		self.data['common']['search_hardware_type-select-'] = self.service('common').list('hardware_type') 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		gateway = {} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		for key, value in enumerate(self.data['common']['search_gateway_id-select---farm_id']): 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			gateway[key] = value 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		""" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		if self.data['common']['search_hardware_type-select-']: 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			del self.data['common']['search_hardware_type-select-'][0] 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -119,7 +123,7 @@ class info_path(Load): 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 					type_info = self.service('common').one('device_type', id=value['type_id']) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 					if type_info: 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 						self.data['list'][key]['type'] = type_info['name'] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-				info = self.service('common').one('device_gateway', id=value['gateway_id']) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+				info = gateway[value['gateway_id']] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				if info: 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 					self.data['list'][key]['gateway'] = info['name'] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				else: 
			 |