From 6e9063683cce0e71a077a6ef0809fc4d967d2359 Mon Sep 17 00:00:00 2001 From: Pavel Kalashnikov Date: Sun, 29 Jan 2017 13:25:35 +0400 Subject: [PATCH 1/4] #FIX decorators --- app/decorators/activity_lines/corporative/merit_decorator.rb | 4 ++++ .../activity_lines/lider/ya_lider/participant_decorator.rb | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/app/decorators/activity_lines/corporative/merit_decorator.rb b/app/decorators/activity_lines/corporative/merit_decorator.rb index 32522aef..59e7a8bb 100644 --- a/app/decorators/activity_lines/corporative/merit_decorator.rb +++ b/app/decorators/activity_lines/corporative/merit_decorator.rb @@ -3,6 +3,10 @@ class ActivityLines::Corporative::MeritDecorator < ApplicationDecorator decorates_association :user + def name + "Почётный знак за заслуги перед МИЦ #{object.nomination} #{object.user.decorate.short_name}" + end + def self.collections [ :honorary_members, :second_degree ] end diff --git a/app/decorators/activity_lines/lider/ya_lider/participant_decorator.rb b/app/decorators/activity_lines/lider/ya_lider/participant_decorator.rb index 4621d80f..6124cc11 100644 --- a/app/decorators/activity_lines/lider/ya_lider/participant_decorator.rb +++ b/app/decorators/activity_lines/lider/ya_lider/participant_decorator.rb @@ -3,6 +3,10 @@ class ActivityLines::Lider::YaLider::ParticipantDecorator < ApplicationDecorator decorates_association :user + def name + object.user.decorate.short_name + end + def self.collections [:active, :won, :lost, :declined] end From d7fc100fdeebab2516eecb8abc8ec8fff34c5a11 Mon Sep 17 00:00:00 2001 From: Pavel Kalashnikov Date: Sun, 29 Jan 2017 13:43:14 +0400 Subject: [PATCH 2/4] #TEST testing all pages in admin --- .../corporative/confessions_controller_test.rb | 12 ++++++++++++ .../corporative/merits_controller_test.rb | 12 ++++++++++++ .../online_conferences_controller_test.rb | 11 +++++++++++ .../lider/ya_lider/participants_controller_test.rb | 12 ++++++++++++ .../lider/ya_liders_controller_test.rb | 12 ++++++++++++ .../web/admin/activity_lines_controller_test.rb | 12 ++++++++++++ .../web/admin/articles_controller_test.rb | 12 ++++++++++++ .../controllers/web/admin/banners_controller_test.rb | 12 ++++++++++++ .../web/admin/comments_controller_test.rb | 12 ++++++++++++ .../web/admin/delivery/campaigns_controller_test.rb | 12 ++++++++++++ .../web/admin/documents_controller_test.rb | 12 ++++++++++++ test/controllers/web/admin/events_controller_test.rb | 12 ++++++++++++ .../web/admin/feedbacks_controller_test.rb | 12 ++++++++++++ test/controllers/web/admin/images_controller_test.rb | 12 ++++++++++++ .../controllers/web/admin/letters_controller_test.rb | 12 ++++++++++++ .../web/admin/logged_actions_controller_test.rb | 10 ++++++++++ .../controllers/web/admin/members_controller_test.rb | 12 ++++++++++++ test/controllers/web/admin/news_controller_test.rb | 12 ++++++++++++ test/controllers/web/admin/places_controller_test.rb | 12 ++++++++++++ .../web/admin/questionaries_controller_test.rb | 12 ++++++++++++ .../web/admin/redirect_rules_controller_test.rb | 12 ++++++++++++ test/controllers/web/admin/tags_controller_test.rb | 12 ++++++++++++ test/controllers/web/admin/teams_controller_test.rb | 12 ++++++++++++ test/controllers/web/admin/users_controller_test.rb | 12 ++++++++++++ test/test_helper.rb | 1 - 25 files changed, 285 insertions(+), 1 deletion(-) diff --git a/test/controllers/web/admin/activity_lines/corporative/confessions_controller_test.rb b/test/controllers/web/admin/activity_lines/corporative/confessions_controller_test.rb index 39558ac7..82851f86 100644 --- a/test/controllers/web/admin/activity_lines/corporative/confessions_controller_test.rb +++ b/test/controllers/web/admin/activity_lines/corporative/confessions_controller_test.rb @@ -13,6 +13,18 @@ class Web::Admin::ActivityLines::Corporative::ConfessionsControllerTest < Action assert_response :success, @response.body end + test 'should get index all pages and tabs' do + if ENV['DB'] == 'prod' + ActivityLines::Corporative::ConfessionDecorator.collections.each do |collection| + pages = ActivityLines::Corporative::Confession.send(collection).count / 25 + (pages + 2).times do |page| + get :index, page: page + assert_response :success + end + end + end + end + test 'should get show' do 4.times { create :argument } get :show, id: @confession diff --git a/test/controllers/web/admin/activity_lines/corporative/merits_controller_test.rb b/test/controllers/web/admin/activity_lines/corporative/merits_controller_test.rb index 5c6d41c0..722d7cf5 100644 --- a/test/controllers/web/admin/activity_lines/corporative/merits_controller_test.rb +++ b/test/controllers/web/admin/activity_lines/corporative/merits_controller_test.rb @@ -18,6 +18,18 @@ class Web::Admin::ActivityLines::Corporative::MeritsControllerTest < ActionContr assert_response :success, @response.body end + test 'should get index all pages and tabs' do + if ENV['DB'] == 'prod' + ActivityLines::Corporative::MeritDecorator.collections.each do |collection| + pages = ActivityLines::Corporative::Merit.send(collection).count / 25 + (pages + 2).times do |page| + get :index, page: page + assert_response :success + end + end + end + end + test 'should get index with search' do get :index, search: @merit.year assert_response :success, @response.body diff --git a/test/controllers/web/admin/activity_lines/corporative/online_conferences_controller_test.rb b/test/controllers/web/admin/activity_lines/corporative/online_conferences_controller_test.rb index e13e17c0..5f53cc96 100644 --- a/test/controllers/web/admin/activity_lines/corporative/online_conferences_controller_test.rb +++ b/test/controllers/web/admin/activity_lines/corporative/online_conferences_controller_test.rb @@ -23,6 +23,17 @@ class Web::Admin::ActivityLines::Corporative::OnlineConferencesControllerTest < assert_response :success, @response.body end + test 'should get index all pages and tabs' do + if ENV['DB'] == 'prod' + ActivityLines::Corporative::OnlineConferenceDecorator.collections.each do |collection| + pages = ActivityLines::Corporative::OnlineConference.send(collection).count / 25 + (pages + 2).times do |page| + get :index, page: page + assert_response :success + end + end + end + end test 'should get index without instances' do ::ActivityLines::Corporative::OnlineConference.destroy_all get :index diff --git a/test/controllers/web/admin/activity_lines/lider/ya_lider/participants_controller_test.rb b/test/controllers/web/admin/activity_lines/lider/ya_lider/participants_controller_test.rb index a2948249..93b6177a 100644 --- a/test/controllers/web/admin/activity_lines/lider/ya_lider/participants_controller_test.rb +++ b/test/controllers/web/admin/activity_lines/lider/ya_lider/participants_controller_test.rb @@ -19,6 +19,18 @@ class Web::Admin::ActivityLines::Lider::YaLider::ParticipantsControllerTest < Ac assert_response :success end + test 'should get index all pages and tabs' do + if ENV['DB'] == 'prod' + ActivityLines::Lider::YaLider::ParticipantDecorator.collections.each do |collection| + pages = ActivityLines::Lider::YaLider::Participant.send(collection).count / 25 + (pages + 2).times do |page| + get :index, page: page + assert_response :success + end + end + end + end + test 'should get index with contest_id' do get :index, contest_id: @participant.contest_id assert_response :success diff --git a/test/controllers/web/admin/activity_lines/lider/ya_liders_controller_test.rb b/test/controllers/web/admin/activity_lines/lider/ya_liders_controller_test.rb index 688ee772..514986df 100644 --- a/test/controllers/web/admin/activity_lines/lider/ya_liders_controller_test.rb +++ b/test/controllers/web/admin/activity_lines/lider/ya_liders_controller_test.rb @@ -19,6 +19,18 @@ class Web::Admin::ActivityLines::Lider::YaLidersControllerTest < ActionControlle assert_response :success, @response.body end + test 'should get index all pages and tabs' do + if ENV['DB'] == 'prod' + ActivityLines::Lider::YaLiderDecorator.collections.each do |collection| + pages = ActivityLines::Lider::YaLider.send(collection).count / 25 + (pages + 2).times do |page| + get :index, page: page + assert_response :success + end + end + end + end + test 'should get index with search' do get :index, search: @ya_lider.contest_year assert_response :success, @response.body diff --git a/test/controllers/web/admin/activity_lines_controller_test.rb b/test/controllers/web/admin/activity_lines_controller_test.rb index 25ed592e..839d0d9f 100644 --- a/test/controllers/web/admin/activity_lines_controller_test.rb +++ b/test/controllers/web/admin/activity_lines_controller_test.rb @@ -18,6 +18,18 @@ class Web::Admin::ActivityLinesControllerTest < ActionController::TestCase assert_response :success, @response.body end + test 'should get index all pages and tabs' do + if ENV['DB'] == 'prod' + ActivityLineDecorator.collections.each do |collection| + pages = ActivityLine.send(collection).count / 25 + (pages + 2).times do |page| + get :index, page: page + assert_response :success + end + end + end + end + test 'should get index with search' do get :index, search: @activity_line.title assert_response :success, @response.body diff --git a/test/controllers/web/admin/articles_controller_test.rb b/test/controllers/web/admin/articles_controller_test.rb index d03134e3..c4601cc9 100644 --- a/test/controllers/web/admin/articles_controller_test.rb +++ b/test/controllers/web/admin/articles_controller_test.rb @@ -18,6 +18,18 @@ class Web::Admin::ArticlesControllerTest < ActionController::TestCase assert_response :success, @response.body end + test 'should get index all pages and tabs' do + if ENV['DB'] == 'prod' + ArticleDecorator.collections.each do |collection| + pages = Article.send(collection).count / 25 + (pages + 2).times do |page| + get :index, page: page + assert_response :success + end + end + end + end + test 'should get index without instances' do Article.destroy_all get :index diff --git a/test/controllers/web/admin/banners_controller_test.rb b/test/controllers/web/admin/banners_controller_test.rb index 8f5fb411..40e3b80b 100644 --- a/test/controllers/web/admin/banners_controller_test.rb +++ b/test/controllers/web/admin/banners_controller_test.rb @@ -18,6 +18,18 @@ class Web::Admin::BannersControllerTest < ActionController::TestCase assert_response :success, @response.body end + test 'should get index all pages and tabs' do + if ENV['DB'] == 'prod' + BannerDecorator.collections.each do |collection| + pages = Banner.send(collection).count / 25 + (pages + 2).times do |page| + get :index, page: page + assert_response :success + end + end + end + end + test 'should get index with search' do get :index, search: @banner.link assert_response :success, @response.body diff --git a/test/controllers/web/admin/comments_controller_test.rb b/test/controllers/web/admin/comments_controller_test.rb index 26d41c34..00061762 100644 --- a/test/controllers/web/admin/comments_controller_test.rb +++ b/test/controllers/web/admin/comments_controller_test.rb @@ -14,6 +14,18 @@ class Web::Admin::CommentsControllerTest < ActionController::TestCase assert_response :success, @response.body end + test 'should get index all pages and tabs' do + if ENV['DB'] == 'prod' + CommentDecorator.collections.each do |collection| + pages = Comment.send(collection).count / 25 + (pages + 2).times do |page| + get :index, page: page + assert_response :success + end + end + end + end + test 'should get index without instances' do Comment.destroy_all get :index diff --git a/test/controllers/web/admin/delivery/campaigns_controller_test.rb b/test/controllers/web/admin/delivery/campaigns_controller_test.rb index 158e1c34..ed029216 100644 --- a/test/controllers/web/admin/delivery/campaigns_controller_test.rb +++ b/test/controllers/web/admin/delivery/campaigns_controller_test.rb @@ -19,6 +19,18 @@ class Web::Admin::Delivery::CampaignsControllerTest < ActionController::TestCase assert_response :success, @response.body end + test 'should get index all pages and tabs' do + if ENV['DB'] == 'prod' + Delivery::CampaignDecorator.collections.each do |collection| + pages = Delivery::Campaign.send(collection).count / 25 + (pages + 2).times do |page| + get :index, page: page + assert_response :success + end + end + end + end + test 'should get index with search' do create_list :delivery_campaign, 5 get :index, search: @campaign.link diff --git a/test/controllers/web/admin/documents_controller_test.rb b/test/controllers/web/admin/documents_controller_test.rb index 08d7b93f..a20506ca 100644 --- a/test/controllers/web/admin/documents_controller_test.rb +++ b/test/controllers/web/admin/documents_controller_test.rb @@ -18,6 +18,18 @@ class Web::Admin::DocumentsControllerTest < ActionController::TestCase assert_response :success, @response.body end + test 'should get index all pages and tabs' do + if ENV['DB'] == 'prod' + DocumentDecorator.collections.each do |collection| + pages = Document.send(collection).count / 25 + (pages + 2).times do |page| + get :index, page: page + assert_response :success + end + end + end + end + test 'should get index without instances' do Document.destroy_all get :index diff --git a/test/controllers/web/admin/events_controller_test.rb b/test/controllers/web/admin/events_controller_test.rb index 21d17168..a8bf72db 100644 --- a/test/controllers/web/admin/events_controller_test.rb +++ b/test/controllers/web/admin/events_controller_test.rb @@ -20,6 +20,18 @@ class Web::Admin::EventsControllerTest < ActionController::TestCase assert_response :success, @response.body end + test 'should get index all pages and tabs' do + if ENV['DB'] == 'prod' + EventDecorator.collections.each do |collection| + pages = Event.send(collection).count / 25 + (pages + 2).times do |page| + get :index, page: page + assert_response :success + end + end + end + end + test 'should get index without instances' do Event.destroy_all get :index diff --git a/test/controllers/web/admin/feedbacks_controller_test.rb b/test/controllers/web/admin/feedbacks_controller_test.rb index 2b13400a..2935f5a3 100644 --- a/test/controllers/web/admin/feedbacks_controller_test.rb +++ b/test/controllers/web/admin/feedbacks_controller_test.rb @@ -18,6 +18,18 @@ class Web::Admin::FeedbacksControllerTest < ActionController::TestCase assert_response :success, @response.body end + test 'should get index all pages and tabs' do + if ENV['DB'] == 'prod' + FeedbackDecorator.collections.each do |collection| + pages = Feedback.send(collection).count / 25 + (pages + 2).times do |page| + get :index, page: page + assert_response :success + end + end + end + end + test 'should get index without instances' do Feedback.destroy_all get :index diff --git a/test/controllers/web/admin/images_controller_test.rb b/test/controllers/web/admin/images_controller_test.rb index ff33eafb..fb5d47e4 100644 --- a/test/controllers/web/admin/images_controller_test.rb +++ b/test/controllers/web/admin/images_controller_test.rb @@ -18,6 +18,18 @@ class Web::Admin::ImagesControllerTest < ActionController::TestCase assert_response :success, @response.body end + test 'should get index all pages and tabs' do + if ENV['DB'] == 'prod' + ImageDecorator.collections.each do |collection| + pages = Image.send(collection).count / 25 + (pages + 2).times do |page| + get :index, page: page + assert_response :success + end + end + end + end + test 'should get index with search' do get :index, search: @image.author_name assert_response :success, @response.body diff --git a/test/controllers/web/admin/letters_controller_test.rb b/test/controllers/web/admin/letters_controller_test.rb index 12915035..98e22846 100644 --- a/test/controllers/web/admin/letters_controller_test.rb +++ b/test/controllers/web/admin/letters_controller_test.rb @@ -19,6 +19,18 @@ class Web::Admin::LettersControllerTest < ActionController::TestCase assert_response :success, @response.body end + test 'should get index all pages and tabs' do + if ENV['DB'] == 'prod' + LetterDecorator.collections.each do |collection| + pages = Letter.send(collection).count / 25 + (pages + 2).times do |page| + get :index, page: page + assert_response :success + end + end + end + end + test 'should get index without instances' do Letter.all.map &:destroy get :index diff --git a/test/controllers/web/admin/logged_actions_controller_test.rb b/test/controllers/web/admin/logged_actions_controller_test.rb index 91bf4f2a..36ff42d7 100644 --- a/test/controllers/web/admin/logged_actions_controller_test.rb +++ b/test/controllers/web/admin/logged_actions_controller_test.rb @@ -17,6 +17,16 @@ class Web::Admin::LoggedActionsControllerTest < ActionController::TestCase assert_response :success, @response.body end + test 'should get index all pages and tabs' do + if ENV['DB'] == 'prod' + pages = LoggedAction.count / 25 + (pages + 2).times do |page| + get :index, page: page + assert_response :success + end + end + end + test 'should get index without instances' do LoggedAction.all.map &:destroy get :index diff --git a/test/controllers/web/admin/members_controller_test.rb b/test/controllers/web/admin/members_controller_test.rb index 35e8126a..69b75e1b 100644 --- a/test/controllers/web/admin/members_controller_test.rb +++ b/test/controllers/web/admin/members_controller_test.rb @@ -24,6 +24,18 @@ class Web::Admin::MembersControllerTest < ActionController::TestCase assert_response :success, @response.body end + test 'should get index all pages and tabs' do + if ENV['DB'] == 'prod' + MemberDecorator.collections.each do |collection| + pages = Member.send(collection).count / 25 + (pages + 2).times do |page| + get :index, page: page + assert_response :success + end + end + end + end + test 'should get show' do get :show, id: @member assert_response :success, @response.body diff --git a/test/controllers/web/admin/news_controller_test.rb b/test/controllers/web/admin/news_controller_test.rb index cb6f0542..22d52b41 100644 --- a/test/controllers/web/admin/news_controller_test.rb +++ b/test/controllers/web/admin/news_controller_test.rb @@ -25,6 +25,18 @@ class Web::Admin::NewsControllerTest < ActionController::TestCase assert_response :success, @response.body end + test 'should get index all pages and tabs' do + if ENV['DB'] == 'prod' + NewsDecorator.collections.each do |collection| + pages = News.send(collection).count / 25 + (pages + 2).times do |page| + get :index, page: page + assert_response :success + end + end + end + end + test 'should get new' do get :new assert_response :success diff --git a/test/controllers/web/admin/places_controller_test.rb b/test/controllers/web/admin/places_controller_test.rb index 264f92fa..4a2f853c 100644 --- a/test/controllers/web/admin/places_controller_test.rb +++ b/test/controllers/web/admin/places_controller_test.rb @@ -23,6 +23,18 @@ class Web::Admin::PlacesControllerTest < ActionController::TestCase assert_response :success, @response.body end + test 'should get index all pages and tabs' do + if ENV['DB'] == 'prod' + PlaceDecorator.collections.each do |collection| + pages = Place.send(collection).count / 25 + (pages + 2).times do |page| + get :index, page: page + assert_response :success + end + end + end + end + test 'should get index without instances' do Place.delete_all get :index diff --git a/test/controllers/web/admin/questionaries_controller_test.rb b/test/controllers/web/admin/questionaries_controller_test.rb index 91f767ad..34dfe9ff 100644 --- a/test/controllers/web/admin/questionaries_controller_test.rb +++ b/test/controllers/web/admin/questionaries_controller_test.rb @@ -20,6 +20,18 @@ class Web::Admin::QuestionariesControllerTest < ActionController::TestCase assert_response :success, @response.body end + test 'should get index all pages and tabs' do + if ENV['DB'] == 'prod' + QuestionaryDecorator.collections.each do |collection| + pages = Questionary.send(collection).count / 25 + (pages + 2).times do |page| + get :index, page: page + assert_response :success + end + end + end + end + test 'should get index without instances' do Questionary.destroy_all get :index diff --git a/test/controllers/web/admin/redirect_rules_controller_test.rb b/test/controllers/web/admin/redirect_rules_controller_test.rb index 10f30ce8..b34ed2f3 100644 --- a/test/controllers/web/admin/redirect_rules_controller_test.rb +++ b/test/controllers/web/admin/redirect_rules_controller_test.rb @@ -23,6 +23,18 @@ class Web::Admin::RedirectRulesControllerTest < ActionController::TestCase assert_response :success, @response.body end + test 'should get index all pages and tabs' do + if ENV['DB'] == 'prod' + RedirectRuleDecorator.collections.each do |collection| + pages = RedirectRule.send(collection).count / 25 + (pages + 2).times do |page| + get :index, page: page + assert_response :success + end + end + end + end + test 'should get index without instances' do RedirectRule.destroy_all get :index diff --git a/test/controllers/web/admin/tags_controller_test.rb b/test/controllers/web/admin/tags_controller_test.rb index 5e308d45..a3e7e1d0 100644 --- a/test/controllers/web/admin/tags_controller_test.rb +++ b/test/controllers/web/admin/tags_controller_test.rb @@ -23,6 +23,18 @@ class Web::Admin::TagsControllerTest < ActionController::TestCase assert_response :success, @response.body end + test 'should get index all pages and tabs' do + if ENV['DB'] == 'prod' + TagDecorator.collections.each do |collection| + pages = Tag.send(collection).count / 25 + (pages + 2).times do |page| + get :index, page: page + assert_response :success + end + end + end + end + test 'should get index without instances' do Tag.destroy_all get :index diff --git a/test/controllers/web/admin/teams_controller_test.rb b/test/controllers/web/admin/teams_controller_test.rb index 3174f773..de05da9f 100644 --- a/test/controllers/web/admin/teams_controller_test.rb +++ b/test/controllers/web/admin/teams_controller_test.rb @@ -24,6 +24,18 @@ class Web::Admin::TeamsControllerTest < ActionController::TestCase assert_response :success, @response.body end + test 'should get index all pages and tabs' do + if ENV['DB'] == 'prod' + TeamDecorator.collections.each do |collection| + pages = Team.send(collection).count / 25 + (pages + 2).times do |page| + get :index, page: page + assert_response :success + end + end + end + end + test 'should get new' do get :new assert_response :success, @response.body diff --git a/test/controllers/web/admin/users_controller_test.rb b/test/controllers/web/admin/users_controller_test.rb index 88ff407b..a99cfe0f 100644 --- a/test/controllers/web/admin/users_controller_test.rb +++ b/test/controllers/web/admin/users_controller_test.rb @@ -23,6 +23,18 @@ class Web::Admin::UsersControllerTest < ActionController::TestCase assert_response :success, @response.body end + test 'should get index all pages and tabs' do + if ENV['DB'] == 'prod' + UserDecorator.collections.each do |collection| + pages = User.send(collection).count / 25 + (pages + 2).times do |page| + get :index, page: page + assert_response :success + end + end + end + end + test 'should create user' do attributes = attributes_for :user post :create, user: attributes diff --git a/test/test_helper.rb b/test/test_helper.rb index ab17bc25..c2269cc3 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -28,7 +28,6 @@ class ActiveSupport::TestCase load "#{Rails.root}/db/seeds.rb" end - def load_fixture(filename) template = ERB.new(File.read(File.dirname(__FILE__) + '/fixtures/#{filename}'), nil, '%') template.result From 823cfbfc10419852eeee2c9d14a72c31a3a48793 Mon Sep 17 00:00:00 2001 From: Pavel Kalashnikov Date: Sun, 29 Jan 2017 13:45:56 +0400 Subject: [PATCH 3/4] #TEST fix document test --- .../controllers/web/admin/documents_controller_test.rb | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/test/controllers/web/admin/documents_controller_test.rb b/test/controllers/web/admin/documents_controller_test.rb index a20506ca..1f008ca0 100644 --- a/test/controllers/web/admin/documents_controller_test.rb +++ b/test/controllers/web/admin/documents_controller_test.rb @@ -20,12 +20,10 @@ class Web::Admin::DocumentsControllerTest < ActionController::TestCase test 'should get index all pages and tabs' do if ENV['DB'] == 'prod' - DocumentDecorator.collections.each do |collection| - pages = Document.send(collection).count / 25 - (pages + 2).times do |page| - get :index, page: page - assert_response :success - end + pages = Document.count / 25 + (pages + 2).times do |page| + get :index, page: page + assert_response :success end end end From 67bd8bace359f8b4e0cb37c8604de96b49b6158a Mon Sep 17 00:00:00 2001 From: Pavel Kalashnikov Date: Sun, 29 Jan 2017 13:57:13 +0400 Subject: [PATCH 4/4] #FIX some fixes --- .../lider/ya_lider/participant_field_decorator.rb | 7 +++++++ .../activity_lines/lider/ya_lider/stage_decorator.rb | 4 ++++ app/decorators/feedback_decorator.rb | 6 ++++++ app/views/web/admin/events/shared/_place_form.html.haml | 1 + config/locales/ru/admin.yml | 2 ++ 5 files changed, 20 insertions(+) create mode 100644 app/decorators/activity_lines/lider/ya_lider/participant_field_decorator.rb diff --git a/app/decorators/activity_lines/lider/ya_lider/participant_field_decorator.rb b/app/decorators/activity_lines/lider/ya_lider/participant_field_decorator.rb new file mode 100644 index 00000000..447b54c5 --- /dev/null +++ b/app/decorators/activity_lines/lider/ya_lider/participant_field_decorator.rb @@ -0,0 +1,7 @@ +class ActivityLines::Lider::YaLider::ParticipantFieldDecorator < ApplicationDecorator + delegate_all + + def name + "#{object.participant.user.decorate.short_name} #{object.title}" + end +end diff --git a/app/decorators/activity_lines/lider/ya_lider/stage_decorator.rb b/app/decorators/activity_lines/lider/ya_lider/stage_decorator.rb index 1082881b..a83640b0 100644 --- a/app/decorators/activity_lines/lider/ya_lider/stage_decorator.rb +++ b/app/decorators/activity_lines/lider/ya_lider/stage_decorator.rb @@ -3,6 +3,10 @@ class ActivityLines::Lider::YaLider::StageDecorator < ApplicationDecorator decorates_association :participants + def name + full_title + end + def full_title "#{object.number} этап #{to_text_in_roman(object.contest.contest_number)} областного конкурса актива учащейся молодёжи «Я-лидер!» #{object.title}" end diff --git a/app/decorators/feedback_decorator.rb b/app/decorators/feedback_decorator.rb index e100b14d..278ded56 100644 --- a/app/decorators/feedback_decorator.rb +++ b/app/decorators/feedback_decorator.rb @@ -3,6 +3,12 @@ class FeedbackDecorator < ApplicationDecorator decorates_association :user + def name + if object.user + "Обратная связь от #{object.user.decorate.short_name}" + end + end + def date I18n.l object.created_at, format: '%d %b' end diff --git a/app/views/web/admin/events/shared/_place_form.html.haml b/app/views/web/admin/events/shared/_place_form.html.haml index 1a30f342..ab805550 100644 --- a/app/views/web/admin/events/shared/_place_form.html.haml +++ b/app/views/web/admin/events/shared/_place_form.html.haml @@ -9,6 +9,7 @@ = simple_form_for @place, remote: true, url: { controller: 'api/admin/places', action: :create } do |f| = f.input :title, as: :string, required: true = f.input :description, as: :string, required: true + = hint @place.model.class.to_s, :url, place: :admin = f.input :url, as: :string, required: true = link_to fa_icon(:foursquare), "https://foursquare.com", class: 'btn btn-info blank' = link_to fa_icon(:google), "https://maps.google.com", class: 'btn btn-info blank' diff --git a/config/locales/ru/admin.yml b/config/locales/ru/admin.yml index 5fb4bb95..c7ec1c2a 100644 --- a/config/locales/ru/admin.yml +++ b/config/locales/ru/admin.yml @@ -119,5 +119,7 @@ ru: mailing_date: 'Если вы не хотите делать отложенную рассылку, оставьте пустым' activity_lines/lider/ya_lider/participant: user_id: Выберите из списка зарегистрированных пользователей. Если пользователь не найден, создайте нового + place: + url: Найдите место в одном из предложенных ниже сервисов. После нахождения вашего места, скопируйте содержимое адресной строки в поле URL notices: functional_in_beta: Функционал находится на бета-тестировании. Это означает, что всё использование этого функционала надо согласовывать с разработчиками сайта. Обязательность согласования пропадёт после прохождения функционалом бета-тестирования.