c80_estate 0.1.0.20 → 0.1.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4e89d64f1f216b65d06a87e02e3b026ddf25ce7
-  data.tar.gz: 1218f83763a3a9dd8d94e50e0325d74cda6c520c
+  metadata.gz: d43a612c39e2ea9c3cd02bfbc712edc2b551582d
+  data.tar.gz: 22581768c9e5e1802d81ed0d0e466764a76676d9
 SHA512:
-  metadata.gz: f13201dc5240646a00b483102d1e4695483b9927507c0fb0b0b95d62ca756fb4f9393d06f0787f767017f385c6d337ea469dcc46c8096e40574d3f228ef4a834
-  data.tar.gz: 9cd8dfdf5252228d4b4af62f77c9250fcbb4f9364420f109c5a73c68537209dae775b900c5a6f096429b62555704f30a238b1b540c35a0e036b8f23b087f55c9
+  metadata.gz: 3b43d89a3bbd7123a7d9a493765743072623e4dbfaed37db2e64e08c62580b3cffceb26280d95dfc7e9fca53056d5ad30bbf16a82b85aa7654eea570fe44f1ec
+  data.tar.gz: 4f9f10d5ec504cf22e5c2e197299ab9e8adce85731083b831315b4eba95cd42a13564015498976c6b68cc84ad5332fbaf1fd9e9018c17283a80c093ac943bf2e

data/app/helpers/c80_estate/areas_helper.rb

@@ -16,7 +16,7 @@ module C80Estate
       result += "<li><span class='ptitle bold'>Объект недвижимости</span>: "
       result += "<a href='/admin/properties/#{area.property.id}'"
       result += "<span class='pvalue'>"
-      result += "#{ area.property.title }"
+      result += "#{ area.property_title }"
       result += "</a></span></li>"
       # result += "<li><span class='ptitle bold'>Объём площади</span>: <span class='pvalue'>#{area.square_value}</span> <span class='puom'>м.кв.</span></li>"
       # result += "<li><span class='ptitle bold'><abbr title='За м.кв. в месяц'>Цена</abbr></span>: <span class='pvalue'>#{area.price_value} </span> <span class='puom'>руб</span></li>"

data/app/models/c80_estate/area.rb

@@ -26,6 +26,10 @@ module C80Estate
 
     has_many :sevents, :dependent => :destroy
 
+    validates :property, :presence => true
+    validates :atype, :presence => true
+    validate :has_astatus?
+
     after_create :create_initial_sevent
     after_update :check_and_generate_sevent
 
@@ -181,6 +185,10 @@ module C80Estate
       self.where(:atype_id => atype_id)
     end
 
+    def has_astatus?
+      errors.add_to_base 'Укажите статус площади' if self.astatuses.blank?
+    end
+
     def atype_title
       res = "-"
       if atype.present?

data/lib/c80_estate/version.rb

@@ -1,3 +1,3 @@
 module C80Estate
-  VERSION = "0.1.0.20"
+  VERSION = "0.1.0.21"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: c80_estate
 version: !ruby/object:Gem::Version
-  version: 0.1.0.20
+  version: 0.1.0.21
 platform: ruby
 authors:
 - C80609A