jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Adjust naming of user and model attributes

Browse Source 
- Remove unnecessary attributes that cause additional SQL queries
- Remove unneeded check for nil on current_item
This commit is contained in:
BrokenEagle
2020-01-05 19:41:45 +00:00
parent 4b904dff5a
commit 5e03c3d84e
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/helpers/application_helper.rb
View File

@@ -205,9 +205,9 @@ module ApplicationHelper
def body_attributes(user = CurrentUser.user, current_item = nil)
user_attributes = %i[id name level level_string theme] + User::BOOLEAN_ATTRIBUTES.map(&:to_sym)
user_attributes += User::Roles.map { |role| :"is_#{role}?" }
mapped_user_attributes = data_attributes_for(user, "user", user_attributes)
mapped_user_attributes = data_attributes_for(user, "current-user", user_attributes)
model_attributes = (!current_item.nil? ? (!current_item.id.nil? ? [:id] : [] ) + current_item.html_data_attributes : [])
mapped_model_attributes = (!current_item.nil? ? data_attributes_for(current_item, "show", model_attributes) : {} )
mapped_model_attributes = (!current_item.nil? ? data_attributes_for(current_item, current_item.model_name.singular.dasherize, model_attributes) : {} )
all_mapped_attributes = mapped_user_attributes.merge(mapped_model_attributes)
controller_param = params[:controller].parameterize.dasherize
action_param = params[:action].parameterize.dasherize