From dbfdd06e34a801a807375c32e5150fb84b37d025 Mon Sep 17 00:00:00 2001 From: Brian Palmer Date: Fri, 25 Mar 2011 13:35:40 -0600 Subject: [PATCH] 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 Tested-by: Hudson --- .../calendar_events/_full_calendar_event.html.erb | 1 - app/views/collaborations/_collaboration.html.erb | 1 - app/views/context/_context_message.html.erb | 1 - app/views/context/_dashboard_collaboration.html.erb | 1 - app/views/context/_dashboard_conference.html.erb | 1 - .../context/_dashboard_context_message.html.erb | 1 - .../context/_dashboard_context_sub_message.html.erb | 1 - app/views/context/_dashboard_notification.html.erb | 1 - app/views/context/_dashboard_topic.html.erb | 1 - app/views/context/_dashboard_topic_entry.html.erb | 1 - app/views/courses/_context_message.html.erb | 1 - app/views/discussion_topics/_entry.html.erb | 1 - app/views/discussion_topics/_sub_entry.html.erb | 1 - app/views/outcomes/_outcome.html.erb | 1 - app/views/shared/_full_assignment.html.erb | 1 - app/views/shared/_identity.html.erb | 1 - app/views/shared/_topic.html.erb | 1 - app/views/wiki_pages/_content.html.erb | 1 - lib/authentication_methods.rb | 13 ------------- 19 files changed, 31 deletions(-) diff --git a/app/views/calendar_events/_full_calendar_event.html.erb b/app/views/calendar_events/_full_calendar_event.html.erb index f9ac5697da9..ad7e0e9cc02 100644 --- a/app/views/calendar_events/_full_calendar_event.html.erb +++ b/app/views/calendar_events/_full_calendar_event.html.erb @@ -26,7 +26,6 @@
<%= calendar_event && calendar_event.description && !calendar_event.description.empty? ? user_content(calendar_event.description, @context.asset_string, calendar_event.asset_string) : 'No Content' %>
- <% 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) %> diff --git a/app/views/collaborations/_collaboration.html.erb b/app/views/collaborations/_collaboration.html.erb index c74c19b5923..fc556f4ca4d 100644 --- a/app/views/collaborations/_collaboration.html.erb +++ b/app/views/collaborations/_collaboration.html.erb @@ -22,7 +22,6 @@
<%= user_content(collaboration.description, @context.asset_string, collaboration.asset_string) rescue nbsp %>
-
<%= (collaboration.users + [collaboration.user]).compact.uniq.length rescue "0" %> Participants <%= (collaboration.users + [collaboration.user]).compact.uniq.length rescue "0" %> Participants diff --git a/app/views/context/_context_message.html.erb b/app/views/context/_context_message.html.erb index 5ea4064ceea..bc0e6bf4d02 100644 --- a/app/views/context/_context_message.html.erb +++ b/app/views/context/_context_message.html.erb @@ -42,7 +42,6 @@
<%= avatar(context_message.try_rescue(:user_id), context.asset_string) %>
<%= user_content(context_message.try_rescue(:formatted_body), context.asset_string, context_message.try_rescue(:asset_string)) || nbsp %>
-
<% (context_message.try_rescue(:attachments) || []).each do |attachment| %>
diff --git a/app/views/context/_dashboard_collaboration.html.erb b/app/views/context/_dashboard_collaboration.html.erb index 80136ccb540..12d21fb7274 100644 --- a/app/views/context/_dashboard_collaboration.html.erb +++ b/app/views/context/_dashboard_collaboration.html.erb @@ -14,7 +14,6 @@
-
<%= user_content(collab.try_rescue(:description), collab.try_rescue(:context_code), collab.try_rescue(:asset_string)) || nbsp %>
diff --git a/app/views/context/_dashboard_conference.html.erb b/app/views/context/_dashboard_conference.html.erb index ddc23e34a48..f9504019be3 100644 --- a/app/views/context/_dashboard_conference.html.erb +++ b/app/views/context/_dashboard_conference.html.erb @@ -14,7 +14,6 @@
-
<%= user_content(conference.try_rescue(:description), conference.try_rescue(:context_code), conference.try_rescue(:asset_string)) || nbsp %>
diff --git a/app/views/context/_dashboard_context_message.html.erb b/app/views/context/_dashboard_context_message.html.erb index f5c81c2f1cc..e33ed4126f9 100644 --- a/app/views/context/_dashboard_context_message.html.erb +++ b/app/views/context/_dashboard_context_message.html.erb @@ -40,7 +40,6 @@
-
<%= user_content(message.try_rescue(:formatted_body), message.try_rescue(:context_code), message.try_rescue(:asset_string)) || nbsp %>
<% (message.try_rescue(:attachments) || []).select{|a| a }.each do |attachment| %> diff --git a/app/views/context/_dashboard_context_sub_message.html.erb b/app/views/context/_dashboard_context_sub_message.html.erb index 4ee71a1774e..61c96c18049 100644 --- a/app/views/context/_dashboard_context_sub_message.html.erb +++ b/app/views/context/_dashboard_context_sub_message.html.erb @@ -10,7 +10,6 @@
<%= avatar((comment.try_rescue(:user_id)), context_code, 30) %>
-
<%= user_content(comment.try_rescue(:formatted_body), comment.try_rescue(:context_code), comment.try_rescue(:asset_string)) || nbsp %>
<% if !comment %> <% form_for :context_message, :url => "#{context_prefix(context_code)}/messages", :html => {:class => "add_sub_message_form context_message_form"} do |f| %> diff --git a/app/views/context/_dashboard_notification.html.erb b/app/views/context/_dashboard_notification.html.erb index f8578a2d8e8..33473bb101e 100644 --- a/app/views/context/_dashboard_notification.html.erb +++ b/app/views/context/_dashboard_notification.html.erb @@ -18,7 +18,6 @@
<%= message.try_rescue(:body) || nbsp %>
-
diff --git a/app/views/context/_dashboard_topic.html.erb b/app/views/context/_dashboard_topic.html.erb index edaffc0e254..d7842d9b50a 100644 --- a/app/views/context/_dashboard_topic.html.erb +++ b/app/views/context/_dashboard_topic.html.erb @@ -29,7 +29,6 @@
<% end %> -
<% if topic && topic.context && topic.context.respond_to?(:assignments) %>
diff --git a/app/views/context/_dashboard_topic_entry.html.erb b/app/views/context/_dashboard_topic_entry.html.erb index 2f2915a98d6..d1775427d0e 100644 --- a/app/views/context/_dashboard_topic_entry.html.erb +++ b/app/views/context/_dashboard_topic_entry.html.erb @@ -10,7 +10,6 @@
<%= avatar((entry.try_rescue(:user_id)), context_code, 30) %>
-
<%= raw entry.try_rescue(:truncated_message) || nbsp %>
<% if !entry %> <% form_for :discussion_entry, :url => "#{context_prefix(context_code)}/discussion_entries", :html => {:class => "add_sub_message_form"} do |f| %> diff --git a/app/views/courses/_context_message.html.erb b/app/views/courses/_context_message.html.erb index e53b6284a19..fd5c3eada58 100644 --- a/app/views/courses/_context_message.html.erb +++ b/app/views/courses/_context_message.html.erb @@ -16,7 +16,6 @@
<%= avatar((context_message.user_id rescue nil), @context.asset_string) %>
-
<%= user_content(context_message.body, @context.asset_string, context_message.asset_string) rescue nbsp %>
diff --git a/app/views/discussion_topics/_entry.html.erb b/app/views/discussion_topics/_entry.html.erb index 78edddfacf1..cb97d424197 100644 --- a/app/views/discussion_topics/_entry.html.erb +++ b/app/views/discussion_topics/_entry.html.erb @@ -51,7 +51,6 @@
<%= avatar((entry.try_rescue(:user_id)), entry_context.asset_string) %>
-
<%= user_content(entry.try_rescue(:message), entry_context.asset_string, entry.try_rescue(:asset_string)) || nbsp %>
diff --git a/app/views/discussion_topics/_sub_entry.html.erb b/app/views/discussion_topics/_sub_entry.html.erb index 0f894f7d04f..dd16ec2fe3a 100644 --- a/app/views/discussion_topics/_sub_entry.html.erb +++ b/app/views/discussion_topics/_sub_entry.html.erb @@ -15,7 +15,6 @@
<%= avatar(entry.try_rescue(:user_id), entry_context.asset_string, 30) %>
-
<%= user_content(entry.try_rescue(:message), entry_context.asset_string, entry.try_rescue(:asset_string)) || nbsp %>
<% if !entry %> diff --git a/app/views/outcomes/_outcome.html.erb b/app/views/outcomes/_outcome.html.erb index fb94a9c7f4b..e5f34a22efa 100644 --- a/app/views/outcomes/_outcome.html.erb +++ b/app/views/outcomes/_outcome.html.erb @@ -27,7 +27,6 @@
 
-
  artifacts
diff --git a/app/views/shared/_full_assignment.html.erb b/app/views/shared/_full_assignment.html.erb index 777a4dde481..52fff9f009a 100644 --- a/app/views/shared/_full_assignment.html.erb +++ b/app/views/shared/_full_assignment.html.erb @@ -68,7 +68,6 @@
<%= assignment && assignment.description && !assignment.description.empty? ? user_content(assignment.description, @context.asset_string, assignment.asset_string) : 'No Content' %>
-
<%= assignment.due_at.to_i rescue "" %> diff --git a/app/views/shared/_identity.html.erb b/app/views/shared/_identity.html.erb index c6ab590c4cd..0c2dd5e6766 100644 --- a/app/views/shared/_identity.html.erb +++ b/app/views/shared/_identity.html.erb @@ -16,7 +16,6 @@
  • <%= link_to "Profile", profile_path %>
    • -
  • <%= link_to "Logout", logout_path, :method => :delete %>
    • diff --git a/app/views/shared/_topic.html.erb b/app/views/shared/_topic.html.erb index 8b2c69d6afb..4ef10fab159 100644 --- a/app/views/shared/_topic.html.erb +++ b/app/views/shared/_topic.html.erb @@ -56,7 +56,6 @@
    <%= avatar((topic.user_id rescue nil), @context.asset_string) %>
    -
    <%= topic && user_content(topic.message, topic.context_code, topic.asset_string) %>
    diff --git a/app/views/wiki_pages/_content.html.erb b/app/views/wiki_pages/_content.html.erb index 3910c7c0660..5428e3b6431 100644 --- a/app/views/wiki_pages/_content.html.erb +++ b/app/views/wiki_pages/_content.html.erb @@ -55,7 +55,6 @@ <%= link_to "Click here to reload the page", request.url %>
    - <% if @page.deleted? %>
    This page has been deleted. diff --git a/lib/authentication_methods.rb b/lib/authentication_methods.rb index d52fd74cfdf..e37583c800e 100644 --- a/lib/authentication_methods.rb +++ b/lib/authentication_methods.rb @@ -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