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

fixes #173 #277

Closed
wants to merge 3 commits into from
Closed

fixes #173 #277

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
dfadfb5
fixing already initialized constant
jnettome Jul 24, 2017
ecd91bb
Merge pull request #1 from jnettome/jnettome-patch-1
jnettome Jul 24, 2017
e017f9d
Update model_additions.rb
jnettome Aug 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/merit.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@ class Engine < Rails::Engine
ActiveSupport.on_load(:action_controller) do
begin
# Load app rules on boot up
Merit::AppBadgeRules = Merit::BadgeRules.new.defined_rules
Merit::AppPointRules = Merit::PointRules.new.defined_rules
Merit::AppBadgeRules ||= Merit::BadgeRules.new.defined_rules
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use SCREAMING_SNAKE_CASE for constants.

Merit::AppPointRules ||= Merit::PointRules.new.defined_rules
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use SCREAMING_SNAKE_CASE for constants.

include Merit::ControllerExtensions
rescue NameError => e
# Trap NameError if installing/generating files
Expand Down
2 changes: 1 addition & 1 deletion lib/merit/model_additions.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ def has_merit(options = {})
# That's why MeritableModel belongs_to Sash. Can't use
# dependent: destroy as it may raise FK constraint exceptions. See:
# https://rails.lighthouseapp.com/projects/8994-ruby-on-rails/tickets/1079-belongs_to-dependent-destroy-should-destroy-self-before-assocation
belongs_to :sash, class_name: 'Merit::Sash', inverse_of: nil
belongs_to :sash, class_name: 'Merit::Sash', inverse_of: nil, optional: true
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Prefer double-quoted strings unless you need single quotes to avoid extra backslashes for escaping.
Line is too long. [82/80]

attr_accessible :sash if show_attr_accessible?

send :"_merit_#{Merit.orm}_specific_config"
Expand Down