tramway-sport_school 1.1.3.1 → 1.1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4dbb22f1ac61272eac826b00c83c4321538db0bf38c03880d76c2a3cc3c9479
-  data.tar.gz: 9efe07de4533d10949d33ade1c05472d54b3a491352fdc220f4772c71fe2f6e1
+  metadata.gz: 886ee4188b0901440b48125c2b471289f2757d8532b6b679f0afa58208bd0acf
+  data.tar.gz: 2b5490955445f4c2ee376d65f078e121c53007decde0e5ce4fa2b2cd227b99a5
 SHA512:
-  metadata.gz: 82bb717efdac9e68eadaa2eedbcb8d22763a2c431cc029d5fc7ed3b48df38f45ec76bfa5b52f2e183bfed99e45a7e3083d7cb31f7ac92df3873906c57528564e
-  data.tar.gz: f368629baec84386653c79a71dce5f75d102f132b3a253909e01d528c7a6e4bc0e9830d5e6a46090c7ef5eb978e4c960721a6e524ca42e9006d445727286d026
+  metadata.gz: e1e3e476181e24de8155abc96edfa90c5c92e479a75f1e4631ffb2427386a5eb5039b9a1cd11aa2baa9902e5c35a69d16ce0d41431a16df40146aadcf8d41d9f
+  data.tar.gz: c42af4944aecb9046c48133cce93a1fad2d94ca91b058d3e52f7502de7d43f71d1178d4c35adc1d9758923e679100c94d5aa2097186466758c4bf272d6fe444f

data/app/models/tramway/sport_school/document.rb

@@ -17,8 +17,8 @@ module Tramway::SportSchool
       end
     end
 
-    scope :published, -> { where view_state: :published }
-    scope :hidden, -> { where view_state: :hidden }
+    scope :published, -> { active.where view_state: :published }
+    scope :hidden, -> { active.where view_state: :hidden }
 
     scope :education, -> { where document_type: :education }
     scope :school_info, -> { where document_type: :school_info }

data/app/models/tramway/sport_school/kind_sport.rb

@@ -15,7 +15,7 @@ module Tramway::SportSchool
       end
     end
 
-    scope :published, -> { where view_state: :published }
-    scope :hidden, -> { where view_state: :hidden }
+    scope :published, -> { active.where view_state: :published }
+    scope :hidden, -> { active.where view_state: :hidden }
   end
 end

data/app/models/tramway/sport_school/organization.rb

@@ -16,6 +16,6 @@ class Tramway::SportSchool::Organization < ::Tramway::Core::ApplicationRecord
     end
   end
 
-  scope :published, -> { where view_state: :published }
-  scope :hidden, -> { where view_state: :hidden }
+  scope :published, -> { active.where view_state: :published }
+  scope :hidden, -> { active.where view_state: :hidden }
 end

data/app/models/tramway/sport_school/trainer.rb

@@ -17,7 +17,7 @@ module Tramway::SportSchool
       end
     end
 
-    scope :published, -> { where view_state: :published }
-    scope :hidden, -> { where view_state: :hidden }
+    scope :published, -> { active.where view_state: :published }
+    scope :hidden, -> { active.where view_state: :hidden }
   end
 end

data/config/locales/state_machines.yml

@@ -8,6 +8,7 @@ ru:
       tramway/sport_school/kind_sport:
         view_state:
           states:
+            published: Отображаемый
             hidden: Скрытый
           events:
             publish: Показать на сайте
@@ -15,6 +16,7 @@ ru:
       tramway/sport_school/trainer:
         view_state:
           states:
+            published: Отображаемый
             hidden: Скрыт с сайта
           events:
             publish: Показать на сайте
@@ -22,6 +24,7 @@ ru:
       tramway/sport_school/document:
         view_state:
           states:
+            published: Отображаемый
             hidden: Скрыт с сайта
           events:
             publish: Показать на сайте

data/lib/tramway/sport_school/version.rb

@@ -1,5 +1,5 @@
 module Tramway
   module SportSchool
-    VERSION = '1.1.3.1'
+    VERSION = '1.1.3.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-sport_school
 version: !ruby/object:Gem::Version
-  version: 1.1.3.1
+  version: 1.1.3.2
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-01 00:00:00.000000000 Z
+date: 2018-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg