ish_models 0.0.33.61 → 0.0.33.62

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b52df6c233f955d2a2ea3edd9ec7e127c463d19e
-  data.tar.gz: 05d0a8cb907b92bd9ae3c42f07bc848878f0232d
+  metadata.gz: 3d4dc0b4818163cc99fb0267851057d0643118ef
+  data.tar.gz: c1ef623fa896a0d37b4fcdd8d37ce978015ce00c
 SHA512:
-  metadata.gz: 29724d165d626e83e35d78dfd4d6d926e53a83daedf722051d4bd0d5b361db4b8027d3a0e103bef0c6c7071002569c9727731abc12daac68f7b84b7b4a0d5027
-  data.tar.gz: caaed0c9de4d7e426c62c4fef135a111036d998796e870598428d58c98e68af477b5abc33ae6aaf82bedc0a5e82efa176fbe26dbe2e6c655f30453a59b447a8f
+  metadata.gz: a20d0d518c6c3ba3528db381acd8e3aefcf3426fc231a7021fb99531cf10412720a772aa0278be0c6f71e192283915556dc2bc205a26a9b25e364ef72cddcc3b
+  data.tar.gz: a723741c9441d74edbea98b9a74698f486502d3ceccc0357b6b62599c1941493d8ded8c6a4d1496b21f91efb51bcac01cfd6df5b88206b83065e8a5dde18100d

data/lib/ish/lead.rb

@@ -16,6 +16,8 @@ class Ish::Lead
 
   field :email
   field :job_url
+  field :company_url
+  field :yelp_url
 
   field :company, :default => ''
   validates_uniqueness_of :company
@@ -33,4 +35,11 @@ class Ish::Lead
   field :tag # 'hired_com_ror', not enumerated for now _vp_ 20180103
   field :location
 
+  field :raw_phone, :type => String
+  def phone= which
+    write_attribute :raw_phone, which
+    write_attribute :phone, which.gsub(/\D/, '').to_i
+  end
+  field :phone, :type => Integer
+
 end

data/lib/tag.rb

@@ -30,6 +30,8 @@ class Tag
   belongs_to :site, :optional => true
   belongs_to :city, :optional => true
 
+  has_and_belongs_to_many :venues
+
   default_scope ->{
     where({ :is_public => true, :is_trash => false }).order_by({ :name => :asc })
   }
@@ -52,7 +54,7 @@ class Tag
 
   def self.list
     out = Tag.unscoped.order_by( :name => :asc )
-    return( [['', nil]] + out.map { |item| [ item.name, item.id ] } )
+    return( [['', nil, :disabled => true]] + out.map { |item| [ item.name, item.id ] } )
   end
 
   # @deprecated, there will be no reports or galleries in tags. There will be only features and newsitems

data/lib/venue.rb

@@ -8,14 +8,15 @@ class Venue
   field :name_seo, :type => String
   validates :name_seo, :uniqueness => true, :allow_nil => false
   
-  field :descr, :type => String
+  field :subhead
+  field :descr
   
   field :is_trash, :type => Boolean, :default => false
   scope :fresh, ->{ where({ :is_trash => false }) }
   scope :trash, ->{ where({ :is_trash => true }) }
 
   field :is_public, :type => Boolean, :default => true
-  scope :public, ->{ where({ :is_public => true }) }
+  scope :public,     ->{ where({ :is_public => true }) }
   scope :not_public, ->{ where({ :is_public => false }) }
 
   field :is_feature, :type => Boolean, :default => false
@@ -29,6 +30,8 @@ class Venue
   # belongs_to :owner, :class_name => 'User', :inverse_of => :owned_venue
   validates :city, :allow_nil => false, :presence => true
 
+  has_and_belongs_to_many :tags
+
   has_and_belongs_to_many :users
 
   has_one :profile_photo, :class_name => 'Photo', :inverse_of => :profile_venue

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_models
 version: !ruby/object:Gem::Version
-  version: 0.0.33.61
+  version: 0.0.33.62
 platform: ruby
 authors:
 - piousbox