diff --git a/app/models/account.rb b/app/models/account.rb index f888aa94853..54cd9816b1e 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -200,10 +200,10 @@ class Account < ActiveRecord::Base @cached_users_name_like ||= {} @cached_users_name_like[query] ||= self.fast_all_users.name_like(query) end - + def fast_all_courses(opts = {}) @cached_fast_all_courses ||= {} - @cached_fast_all_courses[opts] ||= self.associated_courses.active.for_term(opts[:term]).active_first.limit(opts[:limit]).find(:all, :select => "courses.id, name, section, courses.workflow_state, courses.course_code") + @cached_fast_all_courses[opts] ||= self.associated_courses.active.for_term(opts[:term]).active_first.limit(opts[:limit]).find(:all, :select => "courses.id, name, section, courses.workflow_state, courses.course_code, courses.sis_source_id") end def all_users(limit=250) @@ -229,7 +229,7 @@ class Account < ActiveRecord::Base end def courses_name_like(query="") - self.associated_courses.active.active_first.name_like(query).limit(200).find(:all, :select => "courses.id, name, courses.workflow_state, courses.course_code") + self.associated_courses.active.active_first.name_like(query).limit(200).find(:all, :select => "courses.id, name, courses.workflow_state, courses.course_code, courses.sis_source_id") end memoize :courses_name_like diff --git a/app/views/accounts/_course.html.erb b/app/views/accounts/_course.html.erb index ea4a454af79..ffd09005d71 100644 --- a/app/views/accounts/_course.html.erb +++ b/app/views/accounts/_course.html.erb @@ -9,9 +9,14 @@ <% if course %>
- <% if course.course_code != course.name %> -
<%= course.course_code %>
- <% end %> +
+ <% if course.course_code != course.name %> + <%= course.course_code %> + <% end %> + <% if current_user_is_site_admin? && course.respond_to?(:sis_source_id) && course.sis_source_id %> + SIS ID: <%= course.sis_source_id %> + <% end %> +
<% teacher_string = teacher_names[0,2].join(',') %> <% teacher_string += ", #{teacher_names[2..-1].length} more" if teacher_names.length > 2 %> <%= pluralize(student_count || 0, 'Student') %> diff --git a/app/views/courses/course_details.html.erb b/app/views/courses/course_details.html.erb index 87c0da22017..1b96585e2fb 100644 --- a/app/views/courses/course_details.html.erb +++ b/app/views/courses/course_details.html.erb @@ -135,6 +135,11 @@ <% end %> <% if current_user_is_site_admin? %> + <% if @context.sis_source_id %> + + <%= f.label :sis_source_id, "SIS ID:" %> + <%= @context.sis_source_id %> + <% end %> <%= f.label :root_account_id, "Root Account:" %> <%= @context.root_account.name %> @@ -319,7 +324,11 @@ <%= section.display_name %> - (<%= pluralize(section.enrollments.count, "User") %>) + ( + <%= pluralize(section.enrollments.count, "User") %><% if current_user_is_site_admin? && section && section.sis_source_id %>, + SIS ID: <%= section.sis_source_id %> + <% end %> + )
diff --git a/app/views/sections/show.html.erb b/app/views/sections/show.html.erb index 1354b732312..f5e8b4943cc 100644 --- a/app/views/sections/show.html.erb +++ b/app/views/sections/show.html.erb @@ -120,6 +120,9 @@ h3 .tally {
<%= pluralize((@current_enrollments + @completed_enrollments).length, 'Enrollment') %>
+ <% if current_user_is_site_admin? && @section && @section.sis_source_id %> +
SIS ID: <%= @section.sis_source_id %>
+ <% end %> <% if @section.start_at || @section.end_at %>
Runs from <%= datetime_string(@section.start_at) || 'whenever' %> to <%= datetime_string(@section.end_at) || 'whenever' %> diff --git a/app/views/users/_logins.html.erb b/app/views/users/_logins.html.erb index 7fed6292c70..aad13caee45 100644 --- a/app/views/users/_logins.html.erb +++ b/app/views/users/_logins.html.erb @@ -45,6 +45,14 @@ <% end %> <% end %> + <% if current_user_is_site_admin? %> + + <% if pseudonym && pseudonym.sis_source_id %> + SIS ID: + <%= pseudonym.sis_source_id %> + <% end %> + + <% end %> <% if !pseudonym || can_do(pseudonym.account, @current_user, :manage_user_logins) %> '> " class="edit_pseudonym_link"><%= image_tag "edit.png" %>