Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Avoid confusion with class methods and protected/private modifiers #1512

Merged
merged 3 commits into from Feb 13, 2020
Merged

Avoid confusion with class methods and protected/private modifiers #1512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
014529d
The `protected` doesn't affect class methods
pablobm Jan 1, 2020
7ac3911
This `private` doesn't apply to the class method
pablobm Jan 1, 2020
9f465f2
Move class methods to top to avoid confusion
pablobm Jan 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 8 additions & 10 deletions lib/administrate/field/base.rb
View file
Open in desktop
Expand Up @@ -16,6 +16,14 @@ def self.searchable?
false
end

def self.field_type
to_s.split("::").last.underscore
end

def self.permitted_attribute(attr, _options = nil)
attr
end
nickcharlton marked this conversation as resolved.
Show resolved Hide resolved

def initialize(attribute, data, page, options = {})
@attribute = attribute
@data = data
Expand All @@ -24,10 +32,6 @@ def initialize(attribute, data, page, options = {})
@options = options
end

def self.permitted_attribute(attr, _options = nil)
attr
end

def html_class
self.class.html_class
end
Expand All @@ -41,12 +45,6 @@ def to_partial_path
end

attr_reader :attribute, :data, :options, :page, :resource

protected

def self.field_type
to_s.split("::").last.underscore
end
end
end
end
14 changes: 7 additions & 7 deletions lib/administrate/field/has_one.rb
View file
Open in desktop
Expand Up @@ -3,13 +3,6 @@
module Administrate
module Field
class HasOne < Associative
def nested_form
@nested_form ||= Administrate::Page::Form.new(
resolver.dashboard_class.new,
data || resolver.resource_class.new,
)
end

def self.permitted_attribute(attr, options = nil)
associated_class_name =
if options
Expand All @@ -24,6 +17,13 @@ def self.permitted_attribute(attr, options = nil)
{ "#{attr}_attributes": related_dashboard_attributes }
end

def nested_form
@nested_form ||= Administrate::Page::Form.new(
resolver.dashboard_class.new,
data || resolver.resource_class.new,
)
end

private

def resolver
Expand Down
8 changes: 4 additions & 4 deletions lib/administrate/field/polymorphic.rb
View file
Open in desktop
Expand Up @@ -3,6 +3,10 @@
module Administrate
module Field
class Polymorphic < BelongsTo
def self.permitted_attribute(attr, _options = nil)
{ attr => %i{type value} }
end

def associated_resource_grouped_options
classes.map do |klass|
[klass.to_s, candidate_resources_for(klass).map do |resource|
Expand All @@ -11,10 +15,6 @@ def associated_resource_grouped_options
end
end

def self.permitted_attribute(attr, _options = nil)
{ attr => %i{type value} }
end

def permitted_attribute
{ attribute => %i{type value} }
end
Expand Down
4 changes: 2 additions & 2 deletions lib/administrate/view_generator.rb
View file
Open in desktop
Expand Up @@ -5,15 +5,15 @@ module Administrate
class ViewGenerator < Rails::Generators::Base
include Administrate::GeneratorHelpers

private

def self.template_source_path
File.expand_path(
"../../../app/views/administrate/application",
__FILE__,
)
end

private

def copy_resource_template(template_name)
template_file = "#{template_name}.html.erb"

Expand Down