修复了管理员界面多个列表的题目问题

This commit is contained in:
linchun 2016-03-17 15:05:14 +08:00
parent 34c9f54510
commit 52af5e4303
8 changed files with 18 additions and 6 deletions

View File

@ -390,8 +390,8 @@ class AdminController < ApplicationController
#组织
def organization
#@organizations = Organization.find_by_sql("SELECT * FROM organizations ORDER BY created_at DESC")
@organizations = Organization.all.order("created_at desc")
@organizations = Organization.find_by_sql("SELECT * FROM organizations ORDER BY created_at DESC")
#@organizations = Organization.all.order("created_at desc")
respond_to do |format|
format.html
end

View File

@ -61,4 +61,6 @@
<div class="pagination">
<%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false %>
</div>
</div>
<% html_title(l(:label_course_resource_list)) -%>

View File

@ -72,4 +72,6 @@
<% end %>
</tbody>
</table>
</div>
</div>
<% html_title(l(:label_excellent_courses_list)) -%>

View File

@ -88,3 +88,5 @@
<div class="pagination">
<%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false %>
</div>
<% html_title(l(:label_latest_login_teacher_list)) -%>

View File

@ -40,4 +40,4 @@
</table>
</div>
<% html_title(l(:label_project_plural)) -%>
<!% html_title(l(:llabel_organization_list)) -%>

View File

@ -61,4 +61,6 @@
<div class="pagination">
<%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false %>
</div>
</div>
<% html_title(l(:label_project_resource_list)) -%>

View File

@ -1523,6 +1523,9 @@ en:
label_excellent_courses_list: excellent_courses
label_course_resource_list: course_resource_list
label_project_resource_list: project_resource_list
label_organization_list: organzation_list
label_latest_login_teacher_list: latest_login_teacher_list
label_latest_login_user_list: latest_login_teacher_list
#api
label_recently_updated_notification: Recently updated notification

View File

@ -563,6 +563,7 @@ zh:
label_overall_activity: 活动概览
label_new: 新建
label_latest_login_user_list: 最近登录用户列表
label_latest_login_teacher_list: 最近登录教师列表
label_logged_as: 登录为
label_environment: 环境