From c745f69e95d83f457bd3c1b57d8deff51124c638 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Thu, 1 Dec 2016 15:44:15 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=88=90=E5=91=98?= =?UTF-8?q?=E5=88=97=E8=A1=A8=EF=BC=8Cfork=E5=88=97=E8=A1=A8=EF=BC=8C?= =?UTF-8?q?=E5=85=B3=E6=B3=A8=E5=88=97=E8=A1=A8=E6=A0=B7=E5=BC=8F=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E3=80=82=E5=B9=B6=E4=BF=AE=E6=94=B9=E5=B0=8F=E9=93=83?= =?UTF-8?q?=E9=93=9B=E6=B6=88=E6=81=AF=E7=9A=84=E7=8F=AD=E7=BA=A7=E5=8A=A0?= =?UTF-8?q?=E5=85=A5=E7=9A=84=E7=94=B3=E8=AF=B7=E6=96=87=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/projects_controller.rb | 8 ++++---- app/views/issues/_statistics.html.erb | 2 +- app/views/projects/member_forked.html.erb | 5 ++++- app/views/projects/project_watcherlist.html.erb | 4 ++++ app/views/users/_join_course_course_message.html.erb | 6 +++--- 5 files changed, 16 insertions(+), 9 deletions(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index b9d61e61e..dcd337df2 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -543,12 +543,12 @@ class ProjectsController < ApplicationController @users -= watched.watcher_users if @watched end @watchers = @project.watcher_users - @limit = 20 + @limit = 32 @is_remote = true @watchers_count = @watchers.count @watcher_pages = Paginator.new @watchers_count, @limit, params['page'] || 1 @offset ||= @watcher_pages.offset - @watchers = paginateHelper @watchers, 20 + @watchers = paginateHelper @watchers, @limit end end @@ -611,14 +611,14 @@ class ProjectsController < ApplicationController @applied_members = appied_project_members(@project, @members) end end - @members = paginateHelper @members + @members = paginateHelper @members, 32 end def member_forked @forked_projects = Project.where(:forked_from_project_id => @project.id) - @limit = 20 + @limit = 32 @is_remote = true @forked_count = @forked_projects.count @forked_pages = Paginator.new @forked_count, @limit, params['page'] || 1 diff --git a/app/views/issues/_statistics.html.erb b/app/views/issues/_statistics.html.erb index 8b1fc6f22..d284aabb4 100644 --- a/app/views/issues/_statistics.html.erb +++ b/app/views/issues/_statistics.html.erb @@ -4,7 +4,7 @@
-
- +<% else %> + <%= render :partial => "projects/no_data" %> +<% end %> diff --git a/app/views/projects/project_watcherlist.html.erb b/app/views/projects/project_watcherlist.html.erb index 440975e68..c421f4f81 100644 --- a/app/views/projects/project_watcherlist.html.erb +++ b/app/views/projects/project_watcherlist.html.erb @@ -1,3 +1,4 @@ +<% if @watchers.count > 0 %>

成员 本页面展示关注了 <%= link_to @project.owner.try(:show_name), user_path(@project.owner) %>/<%= link_to @project.name, project_path(@project) %> 的用户

+<% else %> + <%= render :partial => "projects/no_data" %> +<% end %> diff --git a/app/views/users/_join_course_course_message.html.erb b/app/views/users/_join_course_course_message.html.erb index c69d66ad0..eacbfac8c 100644 --- a/app/views/users/_join_course_course_message.html.erb +++ b/app/views/users/_join_course_course_message.html.erb @@ -1,11 +1,11 @@
  • 系统提示 - ">您有了新的课程成员申请： + ">您有了新的班级成员申请：
  • - <% content = User.find(ma.course_message_id).name+"申请成为课程\""+"#{Course.find(ma.course_id).name}"+"\"的"+"#{ma.content && ma.content.include?('9') ? "教师" : "教辅"}" %> + <% content = User.find(ma.course_message_id).name+"申请成为课程\""+"#{Course.find(ma.course_id).name}"+"\"的"+"#{ma.content && ma.content.include?('9') ? "教师" : "助教"}" %> <%= link_to content, user_path(User.find(ma.course_message_id), :course_id => ma.course_id), :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}", :target => '_blank', :title => "#{content}" %> @@ -14,7 +14,7 @@
    • + <% if @tip_all_attachments > 0 %>

    <%= render :partial => "files/tip_attachment_count" %> @@ -124,5 +125,8 @@

    <%= render :partial => 'project_list',:locals => {project: @project, all_attachments: @all_attachments, sort:@sort, order:@order, project_attachments:@obj_attachments} %>
    + <% else %> + <%= render :partial => "projects/no_data" %> + <% end %>
    <%# html_title(l(:label_attachment_plural)) -%> \ No newline at end of file diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb index a9f70f999..aa51842aa 100644 --- a/app/views/issues/index.html.erb +++ b/app/views/issues/index.html.erb @@ -214,6 +214,9 @@     新建 + <% if @issues.empty? %> + <%= render :partial => "projects/no_data" %> + <% else %> <% unless @project.enabled_modules.where("name = 'issue_tracking'").empty? %> <%= form_tag({:controller => 'issues', :action => 'index', :project_id => @project},:remote=>'xls', :method => :get,:id=>"issue_query_form", :class => 'query_form') do %> <%= hidden_field_tag 'set_filter', '1' %> @@ -236,7 +239,6 @@ <%= calendar_for('issue_create_date_start_show')%> -
    <% end %> <% end %> -<% if @issues.empty? %> -

    <%= l(:label_no_data) %>

    -<% else %> +
    <%= render :partial => 'issues/all_list', :locals => {:issues => @issues, :query => @query,:issue_pages=>@issue_pages,:issue_count=>@issue_count,:project=>@project,:subject=>@subject} %>
    diff --git a/app/views/projects/_no_data.html.erb b/app/views/projects/_no_data.html.erb index 249a67af0..bc8b97547 100644 --- a/app/views/projects/_no_data.html.erb +++ b/app/views/projects/_no_data.html.erb @@ -1,4 +1,4 @@ -
    +

    没有数据可供显示！

    \ No newline at end of file diff --git a/app/views/projects/member_forked.html.erb b/app/views/projects/member_forked.html.erb index b3cfad1d4..d5dba7ae2 100644 --- a/app/views/projects/member_forked.html.erb +++ b/app/views/projects/member_forked.html.erb @@ -26,5 +26,7 @@
    <% else %> +
    <%= render :partial => "projects/no_data" %> +
    <% end %> diff --git a/app/views/projects/project_watcherlist.html.erb b/app/views/projects/project_watcherlist.html.erb index c421f4f81..1c97e2855 100644 --- a/app/views/projects/project_watcherlist.html.erb +++ b/app/views/projects/project_watcherlist.html.erb @@ -26,7 +26,9 @@
    <% else %> +
    <%= render :partial => "projects/no_data" %> +
    <% end %> diff --git a/app/views/pull_requests/index.html.erb b/app/views/pull_requests/index.html.erb index f2591b6ea..4053e6739 100644 --- a/app/views/pull_requests/index.html.erb +++ b/app/views/pull_requests/index.html.erb @@ -62,6 +62,8 @@ <% else %> +
    <%= render :partial => "projects/no_data" %> +
    <% end %> diff --git a/app/views/users/_project_boardlist.html.erb b/app/views/users/_project_boardlist.html.erb index dbc0b3992..c18b003d2 100644 --- a/app/views/users/_project_boardlist.html.erb +++ b/app/views/users/_project_boardlist.html.erb @@ -2,6 +2,7 @@

    讨论区列表

    + <% if topics.any? %>
    排序： <%= link_to "时间", {:controller => 'boards', :action => 'index', :type => @type, :sort => @b_sort, :order => 1 }, :class => "sortTxt", :remote => true %> @@ -15,7 +16,6 @@
    - <% if topics.any? %> <% topics.each do |activity| %>
    @@ -59,11 +59,11 @@
    - <% else %> -

    <%= l(:label_no_data) %>

    - <% end %>
    + <% else %> + <%= render :partial => "projects/no_data" %> + <% end %>