zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-06-07 21:25:39 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix CodeClimate issues

Browse source
This commit is contained in:
Artur Beljajev 2018-06-06 22:04:26 +03:00
parent 9e2ce0351d
commit 7a5a46b158
4 changed files with 17 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/models/sorted_country.rb
View file

@ -3,13 +3,13 @@ class SortedCountry
include ActionView::Helpers include ActionView::Helpers
def all_options(selected = nil) def all_options(selected = nil)
quick_options = options_for_select(quick_list, { selected: selected }) quick_options = options_for_select(quick_list, selected: selected)
# no double select # no double select
selected = quick_list.map(&:second).include?(selected) ? '' : selected selected = quick_list.map(&:second).include?(selected) ? '' : selected
all_options = options_for_select([['---', '---']] + all_sorted_truncated, all_options = options_for_select([['---', '---']] + all_sorted_truncated,
{ selected: selected, disabled: ['---'] }) selected: selected, disabled: ['---'])
quick_options + all_options quick_options + all_options
end end

2
lib/core_ext/array.rb
View file

@ -2,4 +2,4 @@ class Array
def include_any?(*args) def include_any?(*args)
(self & args).any? (self & args).any?
end end
end end

20
lib/gem_ext/builder.rb
View file

@ -1,12 +1,14 @@
class Builder::XmlMarkup module Builder
def epp_head class XmlMarkup
instruct! def epp_head
epp( instruct!
'xmlns' => 'https://epp.tld.ee/schema/epp-ee-1.0.xsd', epp(
'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance', 'xmlns' => 'https://epp.tld.ee/schema/epp-ee-1.0.xsd',
'xsi:schemaLocation' => 'lib/schemas/epp-ee-1.0.xsd' 'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
) do 'xsi:schemaLocation' => 'lib/schemas/epp-ee-1.0.xsd'
yield ) do
yield
end
end end
end end
end end

2
lib/gem_ext/paper_trail.rb
View file

@ -8,7 +8,7 @@ end
# Store console and rake changes in versions # Store console and rake changes in versions
if defined?(::Rails::Console) || File.basename($PROGRAM_NAME).split(' ').first == 'spring' if defined?(::Rails::Console) || File.basename($PROGRAM_NAME).split(' ').first == 'spring'
PaperTrail.whodunnit = "console-#{`whoami`.strip}" PaperTrail.whodunnit = "console-#{`whoami`.strip}"
elsif File.basename($PROGRAM_NAME) == "rake" elsif File.basename($PROGRAM_NAME) == 'rake'
# rake username does not work when spring enabled # rake username does not work when spring enabled
PaperTrail.whodunnit = "rake-#{`whoami`.strip} #{ARGV.join ' '}" PaperTrail.whodunnit = "rake-#{`whoami`.strip} #{ARGV.join ' '}"
end end