ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove the hidden course_role divs and db lookup 

These are no longer used and can have a significant db cost.

Change-Id: I8fcf7cfe3a20e056310d760d97ca3a04ca387bb7
Reviewed-on: https://gerrit.instructure.com/2825
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
This commit is contained in:
Brian Palmer 2011-03-25 13:35:40 -06:00
parent 22aadd94de
commit dbfdd06e34
19 changed files with 0 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/views/calendar_events/_full_calendar_event.html.erb
View File

@ -26,7 +26,6 @@
<div class="description user_content"><%= calendar_event && calendar_event.description && !calendar_event.description.empty? ? user_content(calendar_event.description, @context.asset_string, calendar_event.asset_string) : 'No Content' %></div>
<div class="course_id" style="display: none;"><%= @context.id if @context && @context.is_a?(Course) %></div>
<div class="course_role" style="display: none;"><%= @role_lookups[@context.asset_string] if @context && @role_lookups %></div>
</div>
<% if can_do(calendar_event, @current_user, :update_content) %>
<% url = calendar_event.new_record? ? context_url(@context, :context_calendar_events_url) : context_url(@context, :context_calendar_event_url, calendar_event.id) %>

1
app/views/collaborations/_collaboration.html.erb
View File

@ -22,7 +22,6 @@
<div class="content">
<div class="message user_content formatted_body"><%= user_content(collaboration.description, @context.asset_string, collaboration.asset_string) rescue nbsp %></div>
<div class="course_id" style="display: none;"><%= @context.id if @context && @context.is_a?(Course) %></div>
<div class="course_role" style="display: none;"><%= @role_lookups[@context.asset_string] if @context && @role_lookups %></div>
<div class="links">
<a href="<%= context_url(context, :context_users_url, :all_messages => 1) %>#message_<%= context_message.id rescue 'none' %>" class="show_participants_link brief_footer_link"><span class="users_count"><%= (collaboration.users + [collaboration.user]).compact.uniq.length rescue "0" %></span> Participants</a>
<a href="#" class="show_participants_link verbose_footer_link"><span class="users_count"><%= (collaboration.users + [collaboration.user]).compact.uniq.length rescue "0" %></span> Participants</a>

1
app/views/context/_context_message.html.erb
View File

@ -42,7 +42,6 @@
<div style="float: left; margin: 0 5px 0 -10px;"><%= avatar(context_message.try_rescue(:user_id), context.asset_string) %></div>
<div class="message user_content formatted_body"><%= user_content(context_message.try_rescue(:formatted_body), context.asset_string, context_message.try_rescue(:asset_string)) || nbsp %></div>
<div class="course_id" style="display: none;"><%= context.id if context && context.is_a?(Course) %></div>
<div class="course_role" style="display: none;"><%= @role_lookups[context.asset_string] if context && @role_lookups %></div>
<div class="attachments_list" style="margin-top: 5px; <%= hidden unless context_message && !context_message.attachments.empty? %>">
<% (context_message.try_rescue(:attachments) || []).each do |attachment| %>
<div class="attachment">

1
app/views/context/_dashboard_collaboration.html.erb
View File

@ -14,7 +14,6 @@
</div>
<div class="content">
<div class="course_id" style="display: none;"><%= collab.context_id if collab && collab.context_type == "Course" %></div>
<div class="course_role" style="display: none;"><%= @role_lookups["#{collab.try_rescue(:context_code)}"] if @role_lookups %></div>
<div class="message user_content">
<%= user_content(collab.try_rescue(:description), collab.try_rescue(:context_code), collab.try_rescue(:asset_string)) || nbsp %>
</div>

1
app/views/context/_dashboard_conference.html.erb
View File

@ -14,7 +14,6 @@
</div>
<div class="content">
<div class="course_id" style="display: none;"><%= conference.context_id if conference && conference.context_type == 'Course' %></div>
<div class="course_role" style="display: none;"><%= @role_lookups["#{conference.try_rescue(:context_code)}"] if @role_lookups %></div>
<div class="message user_content">
<%= user_content(conference.try_rescue(:description), conference.try_rescue(:context_code), conference.try_rescue(:asset_string)) || nbsp %>
</div>

1
app/views/context/_dashboard_context_message.html.erb
View File

@ -40,7 +40,6 @@
</div>
<div class="content">
<div class="course_id" style="display: none;"><%= message.try_rescue(:context_id) %></div>
<div class="course_role" style="display: none;"><%= @role_lookups[message.try_rescue(:context_code)] if message && @role_lookups %></div>
<div class="message user_content formatted_body"><%= user_content(message.try_rescue(:formatted_body), message.try_rescue(:context_code), message.try_rescue(:asset_string)) || nbsp %></div>
<div class="attachments_list" style="margin-top: 5px; <%= hidden unless message && !message.attachments.empty? %>">
<% (message.try_rescue(:attachments) || []).select{|a| a }.each do |attachment| %>

1
app/views/context/_dashboard_context_sub_message.html.erb
View File

@ -10,7 +10,6 @@
<div class="content">
<div style="float: left; margin: 0 5px 0 -10px;"><%= avatar((comment.try_rescue(:user_id)), context_code, 30) %></div>
<div class="course_id" style="display: none;"><%= comment.try_rescue(:context_id) if comment.try_rescue(:context_type) == 'Course' %></div>
<div class="course_role" style="display: none;"><%= @role_lookups[context_code] if @role_lookups %></div>
<div class="message user_content" style="<%= hidden unless comment %>"><%= user_content(comment.try_rescue(:formatted_body), comment.try_rescue(:context_code), comment.try_rescue(:asset_string)) || nbsp %></div>
<% if !comment %>
<% form_for :context_message, :url => "#{context_prefix(context_code)}/messages", :html => {:class => "add_sub_message_form context_message_form"} do |f| %>

1
app/views/context/_dashboard_notification.html.erb
View File

@ -18,7 +18,6 @@
<div class="content">
<div class="message user_content" style="white-space: pre-wrap;"><%= message.try_rescue(:body) || nbsp %></div>
<div class="course_id" style="display: none;"><%= message.asset_context_id if message && message.asset_context_type == 'Course' %></div>
<div class="course_role" style="display: none;"><%= @role_lookups["#{message.try_rescue(:context_code)}"] if message && @role_lookups %></div>
<div class="clear"></div>
</div>
</div>

1
app/views/context/_dashboard_topic.html.erb
View File

@ -29,7 +29,6 @@
</div>
<% end %>
<div class="course_id" style="display: none;"><%= topic.context_id if topic && topic.context_type == 'Course' %></div>
<div class="course_role" style="display: none;"><%= @role_lookups["#{context_code}"] if topic && @role_lookups %></div>
<div class="notes" style="font-size: 0.8em; float: left;">
<% if topic && topic.context && topic.context.respond_to?(:assignments) %>
<div class="for_assignment" style="font-style: italic; <%= hidden unless topic && topic.assignment_id %>">

1
app/views/context/_dashboard_topic_entry.html.erb
View File

@ -10,7 +10,6 @@
<div class="content">
<div style="float: left; margin: 0 5px 0 -10px;"><%= avatar((entry.try_rescue(:user_id)), context_code, 30) %></div>
<div class="course_id" style="display: none;"><%= topic ? topic.context_id : "" %></div>
<div class="course_role" style="display: none;"><%= @role_lookups[context_code] if @role_lookups %></div>
<div class="message user_content" style="<%= hidden unless entry %>"><%= raw entry.try_rescue(:truncated_message) || nbsp %></div>
<% if !entry %>
<% form_for :discussion_entry, :url => "#{context_prefix(context_code)}/discussion_entries", :html => {:class => "add_sub_message_form"} do |f| %>

1
app/views/courses/_context_message.html.erb
View File

@ -16,7 +16,6 @@
<div class="content">
<div style="float: left; margin: 0 5px 0 -10px;"><%= avatar((context_message.user_id rescue nil), @context.asset_string) %></div>
<div class="course_id" style="display: none;"><%= @context.id if @context && @context.is_a?(Course) %></div>
<div class="course_role" style="display: none;"><%= @role_lookups[@context.asset_string] if @context && @role_lookups %></div>
<div class="message user_content"><%= user_content(context_message.body, @context.asset_string, context_message.asset_string) rescue nbsp %></div>
<div class="clear"></div>
</div>

1
app/views/discussion_topics/_entry.html.erb
View File

@ -51,7 +51,6 @@
<div class="content">
<div style="float: left; margin: 0 5px 0 -10px;"><%= avatar((entry.try_rescue(:user_id)), entry_context.asset_string) %></div>
<div class="course_id" style="display: none;"><%= entry_context.id if entry_context && entry_context.is_a?(Course) %></div>
<div class="course_role" style="display: none;"><%= @role_lookups[entry_context.asset_string] if entry_context && @role_lookups %></div>
<div class="message user_content"><%= user_content(entry.try_rescue(:message), entry_context.asset_string, entry.try_rescue(:asset_string)) || nbsp %></div>
<textarea class="message_html" style="display: none;"><%= h(entry.try_rescue(:message)) %></textarea>
<div class="link_box">

1
app/views/discussion_topics/_sub_entry.html.erb
View File

@ -15,7 +15,6 @@
<div class="content">
<div style="float: left; margin: 0 5px 0 -10px;"><%= avatar(entry.try_rescue(:user_id), entry_context.asset_string, 30) %></div>
<div class="course_id" style="display: none;"><%= entry_context.id if entry_context && entry_context.is_a?(Course) %></div>
<div class="course_role" style="display: none;"><%= @role_lookups[entry_context.asset_string] if entry_context && @role_lookups %></div>
<div class="message user_content" style="<%= hidden unless entry %>"><%= user_content(entry.try_rescue(:message), entry_context.asset_string, entry.try_rescue(:asset_string)) || nbsp %></div>
<textarea class="message_html" style="display: none;"><%= h(entry.try_rescue(:message)) %></textarea>
<% if !entry %>

1
app/views/outcomes/_outcome.html.erb
View File

@ -27,7 +27,6 @@
<div class="user_content description">&nbsp;</div>
<textarea style="display: none;" class="description"></textarea>
<div class="course_id" style="display: none;"><%= @context.id if @context && @context.is_a?(Course) %></div>
<div class="course_role" style="display: none;"><%= @role_lookups[@context.asset_string] if @context && @role_lookups %></div>
<div class="aligned_artifacts">
<span class="artifacts_count_for_tied_context">&nbsp;</span> artifacts
</div>

1
app/views/shared/_full_assignment.html.erb
View File

@ -68,7 +68,6 @@
<div class="description user_content"><%= assignment && assignment.description && !assignment.description.empty? ? user_content(assignment.description, @context.asset_string, assignment.asset_string) : 'No Content' %></div>
<div class="course_id" style="display: none;"><%= @context.id if @context && @context.is_a?(Course) %></div>
<div class="course_role" style="display: none;"><%= @role_lookups[@context.asset_string] if @context && @role_lookups %></div>
<div style="display: none;">
<span class="timestamp"><%= assignment.due_at.to_i rescue "" %></span>

1
app/views/shared/_identity.html.erb
View File

@ -16,7 +16,6 @@
<li><%= link_to "Profile", profile_path %></li>
<li class="user_id" style="display: none;"><%= @current_user.id %></li>
<li class="course_id" style="display: none;"><%= @context.id if @context && @context.is_a?(Course) %></li>
<li class="course_role" style="display: none;"><%= @role_lookups[@context.asset_string] if @context && @context.is_a?(Course) && @role_lookups %></li>
<li id="current_context_code" style="display: none;"><%= @context.try_rescue(:asset_string) %></li>
<li class="user_long_name" style="display: none;"><%= @current_user.name %></li>
<li class="logout"><%= link_to "Logout", logout_path, :method => :delete %></li>

1
app/views/shared/_topic.html.erb
View File

@ -56,7 +56,6 @@
<div class="content">
<div style="float: left; margin: 0 5px 0 -10px;"><%= avatar((topic.user_id rescue nil), @context.asset_string) %></div>
<div class="course_id" style="display: none;"><%= topic_context.id if topic_context && topic_context.is_a?(Course) %></div>
<div class="course_role" style="display: none;"><%= @role_lookups[topic_context.asset_string] if topic_context && @role_lookups %></div>
<div class="message user_content"><%= topic && user_content(topic.message, topic.context_code, topic.asset_string) %></div>
<textarea class="message_html" style="display: none;"><%= h(topic.try_rescue(:message)) %></textarea>
<div class="notes" style="font-size: 0.8em; float: left;">

1
app/views/wiki_pages/_content.html.erb
View File

@ -55,7 +55,6 @@
<%= link_to "Click here to reload the page", request.url %>
</div>
<div class="course_id" style="display: none;"><%= @context.id if @context && @context.is_a?(Course) %></div>
<div class="course_role" style="display: none;"><%= @role_lookups[@context.asset_string] if @context && @role_lookups %></div>
<% if @page.deleted? %>
<div id="deleted_message" class="user_content" style="margin-top: 10px;">
This page has been deleted.

13
lib/authentication_methods.rb
View File

@ -111,19 +111,6 @@ module AuthenticationMethods
end
end
@role_lookups = {}
if @current_user
@role_lookups = Rails.cache.fetch(['role_lookups', @current_user].cache_key) do
lookups = {}
@current_user.current_enrollments.select{|e| e.participating? }.each do |enrollment|
lookups[enrollment.class.to_s] = true
lookups["course_#{enrollment.course_id}"] = Enrollment.highest_enrollment_type(lookups["course_#{enrollment.course_id}"], enrollment.class.to_s)
end
lookups
end
else
@userless=true
end
@current_user
end
private :load_user