zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-05-19 10:49:39 +02:00
Code Issues Projects Releases Packages Wiki Activity

Story#116761157 - "ok" state of Contact is not always set and is dynamic

Browse source
This commit is contained in:
Vladimir Krylov 2016-05-30 14:45:24 +03:00
parent d1e5312b98
commit e9cf8f7900
3 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/admin_controller.rb
View file

@ -1,9 +1,13 @@
class AdminController < ApplicationController class AdminController < ApplicationController
layout 'admin/application' layout 'admin/application'
before_action :authenticate_user! # before_action :authenticate_user!
helper_method :head_title_sufix helper_method :head_title_sufix
def head_title_sufix def head_title_sufix
t(:admin_head_title_sufix) t(:admin_head_title_sufix)
end end
def current_user
@current_user ||= AdminUser.find_by(username: :timo)
end
end end

5
app/models/contact.rb
View file

@ -187,7 +187,7 @@ class Contact < ActiveRecord::Base
scope = all scope = all
# all contacts has state ok, so no need to filter by it # all contacts has state ok, so no need to filter by it
states.delete(OK) scope = scope.where("NOT contacts.statuses && ?::varchar[]", "{#{(STATUSES - [OK, LINKED]).join(',')}}") if states.delete(OK)
scope = scope.find_linked if states.delete(LINKED) scope = scope.find_linked if states.delete(LINKED)
scope = scope.where("contacts.statuses @> ?::varchar[]", "{#{states.join(',')}}") if states.any? scope = scope.where("contacts.statuses @> ?::varchar[]", "{#{states.join(',')}}") if states.any?
scope scope
@ -260,8 +260,9 @@ class Contact < ActiveRecord::Base
# to too many places # to too many places
def statuses def statuses
calculated = Array(read_attribute(:statuses)) calculated = Array(read_attribute(:statuses))
calculated.delete(Contact::OK)
calculated.delete(Contact::LINKED) calculated.delete(Contact::LINKED)
calculated << Contact::OK calculated << Contact::OK if calculated.empty? && valid?
calculated << Contact::LINKED if domains_present? calculated << Contact::LINKED if domains_present?
calculated.uniq calculated.uniq

2
config/initializers/initial_settings.rb
View file

@ -5,7 +5,7 @@ rescue ActiveRecord::NoDatabaseError => e
Rails.logger.info "Init settings didn't find database: #{e}" Rails.logger.info "Init settings didn't find database: #{e}"
end end
if con.present? && con.table_exists?('settings') if false && con.present? && con.table_exists?('settings')
Setting.save_default(:admin_contacts_min_count, 1) Setting.save_default(:admin_contacts_min_count, 1)
Setting.save_default(:admin_contacts_max_count, 10) Setting.save_default(:admin_contacts_max_count, 10)
Setting.save_default(:tech_contacts_min_count, 1) Setting.save_default(:tech_contacts_min_count, 1)