add sis id to UI for courses, sections, pseudonyms
refs #4231 Change-Id: I243de9ee8efb2ef6609dca99a9b38bc2200cb573 Reviewed-on: https://gerrit.instructure.com/3011 Tested-by: Hudson <hudson@instructure.com> Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
This commit is contained in:
parent
163ef11193
commit
d4431fef57
|
@ -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
|
||||
|
||||
|
|
|
@ -9,9 +9,14 @@
|
|||
</div>
|
||||
<% if course %>
|
||||
<div class="details ellipsis">
|
||||
<% if course.course_code != course.name %>
|
||||
<div><%= course.course_code %></div>
|
||||
<% end %>
|
||||
<div>
|
||||
<% if course.course_code != course.name %>
|
||||
<span style="padding-right: 30px;"><%= course.course_code %></span>
|
||||
<% end %>
|
||||
<% if current_user_is_site_admin? && course.respond_to?(:sis_source_id) && course.sis_source_id %>
|
||||
SIS ID: <%= course.sis_source_id %>
|
||||
<% end %>
|
||||
</div>
|
||||
<% teacher_string = teacher_names[0,2].join(',') %>
|
||||
<% teacher_string += ", #{teacher_names[2..-1].length} more" if teacher_names.length > 2 %>
|
||||
<span style="display: inline-block; min-width: 80px;"><%= pluralize(student_count || 0, 'Student') %></span>
|
||||
|
|
|
@ -135,6 +135,11 @@
|
|||
</td>
|
||||
<% end %>
|
||||
<% if current_user_is_site_admin? %>
|
||||
<% if @context.sis_source_id %>
|
||||
</tr><tr>
|
||||
<td><%= f.label :sis_source_id, "SIS ID:" %></td>
|
||||
<td><%= @context.sis_source_id %></td>
|
||||
<% end %>
|
||||
</tr><tr>
|
||||
<td><%= f.label :root_account_id, "Root Account:" %></td>
|
||||
<td><%= @context.root_account.name %></td>
|
||||
|
@ -319,7 +324,11 @@
|
|||
<%= section.display_name %>
|
||||
</a>
|
||||
<span class="users_count">
|
||||
(<%= 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 %>
|
||||
)
|
||||
</span>
|
||||
<div class="clear"></div>
|
||||
</li>
|
||||
|
|
|
@ -120,6 +120,9 @@ h3 .tally {
|
|||
<div>
|
||||
<%= pluralize((@current_enrollments + @completed_enrollments).length, 'Enrollment') %>
|
||||
</div>
|
||||
<% if current_user_is_site_admin? && @section && @section.sis_source_id %>
|
||||
<div>SIS ID: <%= @section.sis_source_id %></div>
|
||||
<% end %>
|
||||
<% if @section.start_at || @section.end_at %>
|
||||
<div>
|
||||
Runs from <%= datetime_string(@section.start_at) || 'whenever' %> to <%= datetime_string(@section.end_at) || 'whenever' %>
|
||||
|
|
|
@ -45,6 +45,14 @@
|
|||
<% end %>
|
||||
<% end %>
|
||||
</td>
|
||||
<% if current_user_is_site_admin? %>
|
||||
<td>
|
||||
<% if pseudonym && pseudonym.sis_source_id %>
|
||||
SIS ID:
|
||||
<%= pseudonym.sis_source_id %>
|
||||
<% end %>
|
||||
</td>
|
||||
<% end %>
|
||||
<% if !pseudonym || can_do(pseudonym.account, @current_user, :manage_user_logins) %>
|
||||
<td class='links <%= 'passwordable' if (!pseudonym && can_only_select_current_account_which_is_passwordable) || can_change_pseudonym_password %>'>
|
||||
<a href="#" rel="<%= user_pseudonym_url(@user.id, pseudonym ? pseudonym.id : "{{ id }}") %>" class="edit_pseudonym_link"><%= image_tag "edit.png" %></a>
|
||||
|
|
Loading…
Reference in New Issue