Merge branch 'design_team' into ldap

app/models/ad_banner.rb

@@ -3,10 +3,11 @@ class AdBanner
   include Mongoid::Timestamps
   include Mongoid::MultiParameterAttributes
   include OrbitCoreLib::ObjectAuthable
-  
+
   field :title
   field :transition_msec,type: Integer
   field :ad_fx  #TODO Design should explain
+  field :best_size,:default => ''
 
   before_save :save_or_destroy
   validates_uniqueness_of :title

app/models/object_auth.rb

@@ -11,7 +11,7 @@ class ObjectAuth  < PrototypeAuth
   end
 
   def check_user_has_app_auth
-    sub_managing_users = auth_obj.app_auth.sub_managing_users
+    sub_managing_users = auth_obj.app_auth.sub_managing_users rescue []
     app_auth =  auth_obj.app_auth
     self.auth_users.each do |auth_user|
       if !sub_managing_users.include? auth_user && !auth_user.admin?