From dec054eed8b8b39d833cabb54291c36fdac1dab0 Mon Sep 17 00:00:00 2001 From: Absurdon Date: Fri, 21 Sep 2018 17:30:43 +0200 Subject: [PATCH] removed shoutmsg history removed compmod council group from staff page fixed some errors with missing database entries --- Gemfile.lock | 13 +++--- app/controllers/custom_urls_controller.rb | 1 + app/controllers/shoutmsgs_controller.rb | 4 -- app/models/group.rb | 40 ++++++++++++------- app/views/about/staff.html.erb | 32 --------------- app/views/shoutmsgs/index.html.erb | 20 ---------- app/views/widgets/_shoutbox.html.erb | 1 - .../initializers/abstract_mysql2_adapter.rb | 3 ++ config/routes.rb | 2 +- 9 files changed, 35 insertions(+), 81 deletions(-) delete mode 100644 app/views/shoutmsgs/index.html.erb create mode 100644 config/initializers/abstract_mysql2_adapter.rb diff --git a/Gemfile.lock b/Gemfile.lock index afaa8a6..a9743e7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -155,6 +155,8 @@ GEM hurley (0.2) i18n (0.9.1) concurrent-ruby (~> 1.0) + i18n-js (3.0.11) + i18n (>= 0.6.6, < 2) i18n_data (0.8.0) journey (1.0.4) jquery-rails (2.0.3) @@ -162,7 +164,6 @@ GEM thor (~> 0.14) json (1.8.6) jwt (1.5.6) - libv8 (3.16.14.19) little-plugger (1.1.4) logging (2.2.2) little-plugger (~> 1.1) @@ -236,7 +237,6 @@ GEM rake (10.5.0) rdoc (3.12.2) json (~> 1.4) - ref (2.0.0) representable (3.0.4) declarative (< 0.1.0) declarative-option (< 0.2.0) @@ -295,9 +295,6 @@ GEM net-ssh (>= 2.8.0) test-unit (3.1.9) power_assert - therubyracer (0.12.3) - libv8 (~> 3.16.14.15) - ref thor (0.20.0) tilt (1.4.1) timecop (0.7.4) @@ -350,6 +347,7 @@ DEPENDENCIES font-awesome-sass (~> 4.1.0.0) google-api-client (~> 0.10.3) haml (~> 4.0.5) + i18n-js jquery-rails (~> 2.0.2) mysql2 (~> 0.3.17) neat (~> 1.6.0) @@ -372,14 +370,13 @@ DEPENDENCIES sprockets (~> 2.2.1) steam-condenser! test-unit (~> 3.1.3) - therubyracer (~> 0.12.1) timecop (~> 0.7.1) tinymce-rails (~> 3.5.9) uglifier (~> 2.5.0) will_paginate (~> 3.0.5) RUBY VERSION - ruby 2.2.2p95 + ruby 2.2.10p489 BUNDLED WITH - 1.15.1 + 1.16.5 diff --git a/app/controllers/custom_urls_controller.rb b/app/controllers/custom_urls_controller.rb index a367388..1611999 100644 --- a/app/controllers/custom_urls_controller.rb +++ b/app/controllers/custom_urls_controller.rb @@ -22,6 +22,7 @@ class CustomUrlsController < ApplicationController def show custom_url = CustomUrl.find_by_name(params[:name]) + raise ActiveRecord::RecordNotFound unless custom_url @article = custom_url.article raise AccessError unless @article.can_show? cuser @article.read_by! cuser if cuser diff --git a/app/controllers/shoutmsgs_controller.rb b/app/controllers/shoutmsgs_controller.rb index 041116c..6647daf 100644 --- a/app/controllers/shoutmsgs_controller.rb +++ b/app/controllers/shoutmsgs_controller.rb @@ -1,10 +1,6 @@ class ShoutmsgsController < ApplicationController respond_to :html, :js - def index - @shoutmsgs = Shoutmsg.lastXXX.typebox - end - def show if params[:id2] @shoutmsgs = Shoutmsg.recent.of_object(params[:id], params[:id2]).reverse diff --git a/app/models/group.rb b/app/models/group.rb index f7d61ec..ca22b60 100644 --- a/app/models/group.rb +++ b/app/models/group.rb @@ -22,7 +22,6 @@ class Group < ActiveRecord::Base PREDICTORS = 8 STAFF = 10 GATHER_MODERATORS = 14 - COMP_MOD_COUNCIL = 16 attr_protected :id, :updated_at, :created_at, :founder_id validates_length_of :name, :maximum => 20 @@ -50,7 +49,8 @@ class Group < ActiveRecord::Base def self.staff staff = [] - (find(ADMINS).groupers + find(PREDICTORS).groupers + find(CASTERS).groupers + find(STAFF).groupers + find(REFEREES).groupers).each do |g| + + (admins + casters + referees + extras).each do |g| staff << g unless staff.include? g end staff @@ -58,7 +58,10 @@ class Group < ActiveRecord::Base def self.admins admins = [] - (find(ADMINS).groupers).each do |g| + admin_group = where(id: ADMINS).first + return admins unless admin_group + + (admin_group.groupers).each do |g| admins << g unless admins.include? g end admins @@ -66,7 +69,10 @@ class Group < ActiveRecord::Base def self.referees referees = [] - (find(REFEREES).groupers).each do |g| + referee_group = where(id: REFEREES).first + return referees unless referee_group + + (referee_group.groupers).each do |g| referees << g unless referees.include? g end referees @@ -74,7 +80,13 @@ class Group < ActiveRecord::Base def self.extras extras = [] - (find(PREDICTORS).groupers + find(STAFF).groupers).each do |g| + extra_group = where(id: PREDICTORS).first + staff_group = where(id: STAFF).first + + extra_groupers = extra_group ? extra_group.groupers : [] + staff_groupers = staff_group ? staff_group.groupers : [] + + (extra_groupers + staff_groupers).each do |g| extras << g unless extras.include? g end extras @@ -82,7 +94,10 @@ class Group < ActiveRecord::Base def self.casters casters = [] - (find(CASTERS).groupers).each do |g| + caster_group = where(id:CASTERS).first + return casters unless caster_group + + (caster_group.groupers).each do |g| casters << g unless casters.include? g end casters @@ -90,17 +105,12 @@ class Group < ActiveRecord::Base def self.gathermods gathermods = [] - (find(GATHER_MODERATORS).groupers).each do |g| + gathermod_group = where(id:GATHER_MODERATORS).first + return gathermods unless gathermod_group + + (gathermod_group.groupers).each do |g| gathermods << g unless gathermods.include? g end gathermods end - - def self.compmodcouncil - compmodcouncil = [] - (find(COMP_MOD_COUNCIL).groupers).each do |g| - compmodcouncil << g unless compmodcouncil.include? g - end - compmodcouncil - end end diff --git a/app/views/about/staff.html.erb b/app/views/about/staff.html.erb index 19be4d6..c8c23b5 100644 --- a/app/views/about/staff.html.erb +++ b/app/views/about/staff.html.erb @@ -19,7 +19,6 @@
  • Referees
  • Casters
  • Gather Mods
    • -
  • Comp. Mod Council
  • Extras
  • Support
    • @@ -148,37 +147,6 @@ <% end %> -
    -

    COMP. MOD COUNCIL

    - - - - - - - - - <% Group.compmodcouncil.each do |grouper| %> - - - - <% if grouper.user.public_email %> - - <% else %> - - <% end %> - - - - <% end %> -
    UsernameEmailTaskAge
    <%= flag grouper.user.country %><%= namelink grouper.user %><%= h grouper.user.email_s %> - <% if grouper.task %> - <%= h grouper.task %> - <% else %> - <%= h grouper.group.name.singularize %> - <% end %> - <%= h grouper.user.age %>
    -

    Extras

    diff --git a/app/views/shoutmsgs/index.html.erb b/app/views/shoutmsgs/index.html.erb deleted file mode 100644 index 9299454..0000000 --- a/app/views/shoutmsgs/index.html.erb +++ /dev/null @@ -1,20 +0,0 @@ -

    Last 500 Shoutbox Messages

    - -
    - - - - - - - - <% @shoutmsgs.each do |shoutmsg| %> - - - - - - - <% end %> -
    DateTimeUserText
    <%= shoutmsg.created_at.strftime("%Y/%m/%d") %><%= shoutmsg.created_at.strftime("%H:%M") %><%= link_to shoutmsg.user, shoutmsg.user %><%= shoutmsg.text %>
    - diff --git a/app/views/widgets/_shoutbox.html.erb b/app/views/widgets/_shoutbox.html.erb index a962752..60582e4 100644 --- a/app/views/widgets/_shoutbox.html.erb +++ b/app/views/widgets/_shoutbox.html.erb @@ -6,7 +6,6 @@
    <%= render partial: "shoutmsgs/new", locals: { shoutmsg: Shoutmsg.new } %> - <%= link_to "Shoutbox Recent History", controller: :shoutmsgs, action: "index" %>
    <%= link_to "Shoutbox Rules", article_path(Article::SB_RULES) %> diff --git a/config/initializers/abstract_mysql2_adapter.rb b/config/initializers/abstract_mysql2_adapter.rb new file mode 100644 index 0000000..12ecd46 --- /dev/null +++ b/config/initializers/abstract_mysql2_adapter.rb @@ -0,0 +1,3 @@ +class ActiveRecord::ConnectionAdapters::Mysql2Adapter + NATIVE_DATABASE_TYPES[:primary_key] = "int(11) auto_increment PRIMARY KEY" +end diff --git a/config/routes.rb b/config/routes.rb index c783a93..0a21852 100755 --- a/config/routes.rb +++ b/config/routes.rb @@ -35,7 +35,7 @@ Ensl::Application.routes.draw do match "comments/quote" resources :comments - resources :shoutmsgs + resources :shoutmsgs, except: :index resources :teamers resources :teams resources :gathers