fix small bug

ilya-maltsev · Nov 30, 2016 · 0075ee6 · 0075ee6
1 parent 6aa1a16
commit 0075ee6
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/app/controllers/ientities_controller.rb b/app/controllers/ientities_controller.rb
@@ -25,8 +25,12 @@ def ientity_show_list
     else 
       if params[:res_id].present?
         iresource = IResource.where(:id => params[:res_id]).first
-        if iresource.has_entities == true && IResource.available_for_user(params[:res_id], User.current.id)
-          ies = iresource.ientities.active.select(['i_entities.id',:name, :ipv4])
+        if iresource.has_entities && IResource.available_for_user(params[:res_id], User.current.id)
+          if iresource.has_ip
+            ies = iresource.ientities.active.select(['i_entities.id',:name, :ipv4])
+          else
+            ies = iresource.ientities.active.select(['i_entities.id',:name])
+          end
         else
           ies = []
         end