tramway-conference 1.9.4.3 → 1.9.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b6fafa441ff9f4c05fa03fabb896072227e1cd73aea826dc913ab770990153d
-  data.tar.gz: 4c61b43ca2351df38cc883d0d1d603ca832f3ab003421707a683a5b22f33fbb1
+  metadata.gz: 12b943edd9bc36fff87d53a2b178a778b7b9b11088b137f62d2a7d294d9f831e
+  data.tar.gz: a4fd4804b2904759d58a53ede5fac20ab00ecf87729eede7e736d3000b8f20f5
 SHA512:
-  metadata.gz: ff819282220c46754910582be4cf5189255f2781313cfe46722e24ed6dc75ab6ddc7f1f1bfa25a22488a795f201341651375868009149b27bd90c51b0e6c3889
-  data.tar.gz: 153e0796f71e0b0ef5a54935c4718efba6649893b8bb2965de1992f9fafcd776235b4da27fcf3424bf8c56eab0b72e7482ffb3a563d985846682a7d7d1d84d6c
+  metadata.gz: d8386dd5ab0c0305e2a14e3d2c021902cf99fbe7cc307d8b34a5632bd7606418293e403e18ca032edbbdd649bc73a70fccc366bf910cb6ae6f38af239de89859
+  data.tar.gz: 1c10b6ee6d374c029516f179a5cefc70be738f27915b9e042ba647380deb23ec03d5abed773cb504a13a81b9526ef4521b8f6bbb66355c26804c55fe32ca81d0

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

@@ -6,16 +6,16 @@ class Tramway::Conference::Web::WelcomeController < ::Tramway::Conference::Appli
   def index
     @unity = ::Tramway::Conference::Unity.includes(:social_networks).first
     @blocks = ::Tramway::Landing::BlockDecorator.decorate ::Tramway::Landing::Block.on_main_page
-    @news = ::Tramway::News::News.active.first(3).map { |t| ::Tramway::Landing::Cards::NewsDecorator.new t }
-    past_events = ::Tramway::Event::EventLinkDecorator.decorate ::Tramway::Event::Event.active.past.open.order begin_date: :desc
+    @news = ::Tramway::News::News.first(3).map { |t| ::Tramway::Landing::Cards::NewsDecorator.new t }
+    past_events = ::Tramway::Event::EventLinkDecorator.decorate ::Tramway::Event::Event.past.open.order begin_date: :desc
     past_events_links = Tramway::Landing::NavbarDecorator.new [{ past_events: past_events }]
-    actual_events = ::Tramway::Event::EventLinkDecorator.decorate ::Tramway::Event::Event.active.actual.open.order :begin_date
+    actual_events = ::Tramway::Event::EventLinkDecorator.decorate ::Tramway::Event::Event.actual.open.order :begin_date
     @links = actual_events + past_events_links
     @close_events = ::Tramway::Event::Event.actual.open.map do |event|
       ::Tramway::Event::EventAsPageWithButtonDecorator.decorate event
     end
     @partners = ::Tramway::Partner::Partnership.partnership_type.values.reduce({}) do |hash, partnership_type|
-      hash.merge! partnership_type => (@unity.send(partnership_type.to_s.pluralize).active.map do |partner|
+      hash.merge! partnership_type => (@unity.send(partnership_type.to_s.pluralize).map do |partner|
         Tramway::Partner::OrganizationFeatureDecorator.decorate partner
       end)
     end

data/app/decorators/tramway/conference/unity_decorator.rb

@@ -7,7 +7,7 @@ class Tramway::Conference::UnityDecorator < ::Tramway::Core::ApplicationDecorato
     end
 
     def show_attributes
-      %i[title tagline logo address phone latitude longtitude url found_date email]
+      %i[title tagline logo address phone latitude longtitude url found_date email favicon]
     end
 
     def show_associations
@@ -15,7 +15,7 @@ class Tramway::Conference::UnityDecorator < ::Tramway::Core::ApplicationDecorato
     end
   end
 
-  delegate_attributes :title, :logo, :tagline, :address, :phone, :latitude, :longtitude, :url, :found_date, :email
+  delegate_attributes :title, :logo, :tagline, :address, :phone, :latitude, :longtitude, :url, :found_date, :email, :favicon
 
   decorate_association :social_networks
 end

data/app/forms/admin/tramway/conference/unity_form.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
 class Admin::Tramway::Conference::UnityForm < ::Tramway::Core::ApplicationForm
-  properties :title, :tagline, :logo, :state, :phone, :address, :longtitude, :latitude, :url, :found_date, :email
+  properties :title, :tagline, :logo, :state, :phone, :address, :longtitude, :latitude, :url, :found_date, :email,
+    :favicon, :public_name
 
   def initialize(object)
     super(object).tap do
@@ -13,7 +14,9 @@ class Admin::Tramway::Conference::UnityForm < ::Tramway::Core::ApplicationForm
                       longtitude: :string,
                       url: :string,
                       found_date: :date_picker,
-                      email: :string
+                      email: :string,
+                      favicon: :file,
+                      public_name: :string
     end
   end
 end

data/app/models/tramway/conference/unity.rb

@@ -5,5 +5,7 @@ module Tramway::Conference
     has_many :social_networks, as: :record, class_name: 'Tramway::Profiles::SocialNetwork'
 
     include ::Tramway::Partner::Scopes
+
+    uploader :favicon, :ico
   end
 end

data/app/views/tramway/conference/web/welcome/index.html.haml

@@ -28,14 +28,15 @@
 - @collection_news = @news
 
 %br
-.container
-  .row-fluid
-    %h1.text-center
-      Ближайшие мероприятия
-- @close_events.each do |event|
+- if @close_events.any?
   .container
     .row-fluid
-      = render 'tramway/landing/templates/section_with_image_and_text', block: event
+      %h1.text-center
+        Ближайшие мероприятия
+  - @close_events.each do |event|
+    .container
+      .row-fluid
+        = render 'tramway/landing/templates/section_with_image_and_text', block: event
 
 - content_for :main_image do
   = request.protocol + request.host_with_port + @blocks.select { |block| block.model.block_type.header? }.first.background.url

data/config/locales/ru.yml

@@ -2,9 +2,6 @@ ru:
   application:
     name: Конференция
     tagline: Главный слоган лендоса конференции
-  tramway:
-    landing:
-      blocks:
-        block_types:
-          header:
-            past_events: Прошедшие мероприятия
+  navbar:
+    links:
+      past_events: Прошедшие мероприятия

data/lib/tramway/conference/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Conference
-    VERSION = '1.9.4.3'
+    VERSION = '1.9.5.4'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tramway-conference
 version: !ruby/object:Gem::Version
-  version: 1.9.4.3
+  version: 1.9.5.4
 platform: ruby
 authors:
 - Dmitry Korotin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-05 00:00:00.000000000 Z
+date: 2021-12-19 00:00:00.000000000 Z
 dependencies: []
 description: Engine for Conference web sites
 email:
@@ -76,7 +76,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 Conference web sites