tramway-sport_school 1.2.12.2 → 1.2.12.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af5ea2ccf7649a8de556ecea2abd248293b288d5351e5dc595bcdde22829feb4
-  data.tar.gz: ef6a5e41904f4b8ba04e82dfd8ed39aa5799ac979228d38663092d272881c4cd
+  metadata.gz: 5c242fd010f3c69258108167b41453eb1be0b70b278f98f4a3a98ee5b3827f78
+  data.tar.gz: c13d0352ad9438d8ce8e7fad72d5c6080287350e5c88f0955acdeb2bebb6b0b1
 SHA512:
-  metadata.gz: 61fde47bf5ca03a91470afae12cebd494cac290d91e303b42eb19969ba15339d8cd27b7547472178bb5e2ab03c6ec5ed09f93619e29c55de4ffbd70dfb96f3bc
-  data.tar.gz: 685916e870810d8cb8a5dd3662e202912cd6603320dc0258b147fac5b9052d6b7a914e9f0fa5b56368eebba29548ad4d942f8655b8706a646a678ef7fb1fed1c
+  metadata.gz: 0e0862e8a57850ff800c8c6a12dffbef40667b8f5d5f8b2052304393fbf8c3e9f6b59c083bec5d53e0224dced233812e337bbf642886e97277671c3a18bd6b65
+  data.tar.gz: 978dfcb55dc786a243e529f88ea003539e8d0535a9d82aecf75aa258ea2cef92acf218b30c7ec7593159832c8887734c6e4251ee663271c9db54494b76320970

data/app/controllers/tramway/sport_school/web/welcome_controller.rb

@@ -4,15 +4,15 @@ require_dependency 'tramway/sport_school/application_controller'
 
 class Tramway::SportSchool::Web::WelcomeController < ::Tramway::SportSchool::ApplicationController
   def index
-    @kind_sports = ::Tramway::SportSchool::KindSport.active.published.map { |k| ::Tramway::SportSchool::Features::KindSportDecorator.new k }
-    @documents = ::Tramway::SportSchool::Document.active.published
-    @trainers = ::Tramway::SportSchool::Trainer.active.published.map { |t| ::Tramway::SportSchool::Cards::TrainerDecorator.new t }
+    @kind_sports = ::Tramway::SportSchool::KindSport.published.map { |k| ::Tramway::SportSchool::Features::KindSportDecorator.new k }
+    @documents = ::Tramway::SportSchool::Document.published
+    @trainers = ::Tramway::SportSchool::Trainer.published.map { |t| ::Tramway::SportSchool::Cards::TrainerDecorator.new t }
     @institution = ::Tramway::SportSchool::Institution.includes(:social_networks).first
     blocks = ::Tramway::Landing::Block.on_main_page
     @links = ::Tramway::Landing::BlockLinkDecorator.decorate blocks.with_navbar_link
     @blocks = ::Tramway::Landing::BlockDecorator.decorate blocks
     @organizations = ::Tramway::SportSchool::Organization.published
-    @news = ::Tramway::News::News.active.last(3).reverse.map { |t| ::Tramway::Landing::Cards::NewsDecorator.new t }
+    @news = ::Tramway::News::News.last(3).reverse.map { |t| ::Tramway::Landing::Cards::NewsDecorator.new t }
     @education_documents = ::Tramway::SportSchool::Document.published.education.map { |t| ::Tramway::SportSchool::Cards::DocumentDecorator.new t }
     @school_info_documents = ::Tramway::SportSchool::Document.published.school_info.map { |t| ::Tramway::SportSchool::Cards::DocumentDecorator.new t }
     @provision_documents = ::Tramway::SportSchool::Document.published.provision.map { |t| ::Tramway::SportSchool::Cards::DocumentDecorator.new t }

data/app/decorators/tramway/sport_school/document_decorator.rb

@@ -9,8 +9,16 @@ class Tramway::SportSchool::DocumentDecorator < ::Tramway::Core::ApplicationDeco
     def list_attributes
       [:view_state]
     end
+
+    def show_attributes
+      [:title]
+    end
+
+    delegate :human_view_state_event_name, to: :model_class
   end
 
+  delegate_attributes :title
+
   def view_state
     object.human_view_state_name
   end

data/app/decorators/tramway/sport_school/institution_decorator.rb

@@ -7,5 +7,5 @@ class Tramway::SportSchool::InstitutionDecorator < ::Tramway::Core::ApplicationD
     end
   end
 
-  delegate :logo, to: :object
+  delegate_attributes :logo, :title
 end

data/config/initializers/tramway.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-::Tramway::Auth.root_path = '/admin'
+::Tramway::Auth.root_path_for Tramway::User::User => '/admin'
 ::Tramway::Admin.set_available_models(::Tramway::SportSchool::KindSport,
   ::Tramway::SportSchool::Trainer,
   ::Tramway::SportSchool::Document,

data/lib/tramway/sport_school/generates/install_generator.rb

@@ -42,6 +42,7 @@ module Tramway::SportSchool::Generators
         add_name_to_tramway_sport_school_institutions
         add_main_image_to_tramway_sport_school_institutions
         add_favicon_to_tramway_sport_school_institutions
+        add_public_name_to_tramway_sport_school_institutions
       ]
       migrations.each do |migration|
         migration_template "#{migration}.rb", "db/migrate/#{migration}.rb"

data/lib/tramway/sport_school/generates/templates/add_public_name_to_tramway_sport_school_institutions.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddPublicNameToTramwaySportSchoolInstitutions < ActiveRecord::Migration[5.1]
+  def change
+    add_column :tramway_sport_school_institutions, :public_name, :text
+  end
+end

data/lib/tramway/sport_school/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module SportSchool
-    VERSION = '1.2.12.2'
+    VERSION = '1.2.12.6'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-sport_school
 version: !ruby/object:Gem::Version
-  version: 1.2.12.2
+  version: 1.2.12.6
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-13 00:00:00.000000000 Z
+date: 2021-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -94,6 +94,7 @@ files:
 - lib/tramway/sport_school/generates/templates/add_ll_to_tramway_sport_school_institutions.rb
 - lib/tramway/sport_school/generates/templates/add_main_image_to_tramway_sport_school_institutions.rb
 - lib/tramway/sport_school/generates/templates/add_name_to_tramway_sport_school_institutions.rb
+- lib/tramway/sport_school/generates/templates/add_public_name_to_tramway_sport_school_institutions.rb
 - lib/tramway/sport_school/generates/templates/add_state_to_tramway_sport_school_kind_sports.rb
 - lib/tramway/sport_school/generates/templates/add_url_to_tramway_sport_school_institutions.rb
 - lib/tramway/sport_school/generates/templates/create_tramway_sport_school_documents.rb
@@ -121,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Engine for Sport School web sites