hushasha
/
trustieforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

修改《关注老师后，老师发布的作业都会在我主页的动态中显示出来，若我未加入该课程但感兴趣点击后返回403页面，提示不够人性化》bug

Browse Source 
Signed-off-by: alan <547533434@qq.com>
dev_chuangbin
alan 11 years ago
parent 49cb52146f
commit d81240e63c
3 changed files with 68 additions and 27 deletions
Show Stats Download Patch File Download Diff File

19
app/controllers/application_controller.rb
Unescape View File

@ -236,13 +236,7 @@ class ApplicationController < ActionController::Base
# Authorize the user for the requested action # Authorize the user for the requested action
def authorize(ctrl = params[:controller], action = params[:action], global = false) def authorize(ctrl = params[:controller], action = params[:action], global = false)
#modify by NWB #modify by NWB
if @project allowed = authorize_allowed(params[:controller], params[:action],global)
allowed = User.current.allowed_to?({:controller => ctrl, :action => action}, @project || @projects, :global => global)
elsif @course
allowed = User.current.allowed_to?({:controller => ctrl, :action => action}, @course || @courses, :global => global)
else
allowed = User.current.allowed_to?({:controller => ctrl, :action => action}, @project || @projects, :global => global)
end
if allowed if allowed
true true
@ -255,6 +249,17 @@ class ApplicationController < ActionController::Base
end end
end end
def authorize_allowed(ctrl = params[:controller], action = params[:action], global = false)
#modify by NWB
if @project
allowed = User.current.allowed_to?({:controller => ctrl, :action => action}, @project || @projects, :global => global)
elsif @course
allowed = User.current.allowed_to?({:controller => ctrl, :action => action}, @course || @courses, :global => global)
else
allowed = User.current.allowed_to?({:controller => ctrl, :action => action}, @project || @projects, :global => global)
end
allowed
end
def authorize_attachment_download(ctrl = params[:controller], action = params[:action], global = false) def authorize_attachment_download(ctrl = params[:controller], action = params[:action], global = false)
case @attachment.container_type case @attachment.container_type
when "Memo" when "Memo"

9
app/controllers/users_controller.rb
Unescape View File

@ -433,9 +433,16 @@ class UsersController < ApplicationController
else else
activity = Activity.where(where_condition).where('user_id = ?', @user.id).order('id desc') activity = Activity.where(where_condition).where('user_id = ?', @user.id).order('id desc')
end end
activity = activity.reject { |e|
((e.act_type=="Issue") && ( !e.act.visible?(User.current))) ||
((e.act_type == "Journal") && (!e.act.project.visible?(User.current))) ||
((e.act_type == "Bid") && (e.act.homework_for_courses.count > 0 &&
(!e.act.homework_for_courses.first.course.visible?(User.current) ||
!User.current.member_of_course?(e.act.homework_for_courses.first.course) || !User.current.admin?)))
}
@activity_count = activity.count @activity_count = activity.count
@activity_pages = Paginator.new @activity_count, pre_count, params['page'] @activity_pages = Paginator.new @activity_count, pre_count, params['page']
@activity = activity.offset(@activity_pages.offset).limit(@activity_pages.per_page).all @activity = activity.slice(@activity_pages.offset,@activity_pages.per_page)
@state = 0 @state = 0
end end

67
app/views/users/show.html.erb
Unescape View File

@ -46,9 +46,10 @@
<% act = e.act %> <% act = e.act %>
<% unless act.nil? %> <% unless act.nil? %>
<% if e.act_type == 'JournalsForMessage' || e.act_type == 'Bid' || e.act_type == 'Journal'|| e.act_type == 'Changeset' || e.act_type == 'Message' || e.act_type == 'Principal' || e.act_type == 'News' || e.act_type == 'Issue' || e.act_type == 'Contest'%> <% if e.act_type == 'JournalsForMessage' || e.act_type == 'Bid' || e.act_type == 'Journal'|| e.act_type == 'Changeset' || e.act_type == 'Message' || e.act_type == 'Principal' || e.act_type == 'News' || e.act_type == 'Issue' || e.act_type == 'Contest'%>
<table width="660" border="0" align="left" style="border-bottom: 1px dashed rgb(204, 204, 204); margin-bottom: 10px;font-size:14px;">
<table width="660" border="0" align="left" style="border-bottom: 1px dashed rgb(204, 204, 204); margin-bottom: 10px;font-size:14px;">
<tr> <tr>
<td colspan="2" valign="top" width="50"> <td colspan="2" valign="top" width="50">
<%= image_tag(url_to_avatar(e.user), :class => "avatar") %> <%= image_tag(url_to_avatar(e.user), :class => "avatar") %>
</td> </td>
<td> <td>
@ -430,8 +431,9 @@
</td> </td>
</tr> </tr>
<% when 'Issue' %> <% when 'Issue' %>
<tr> <% if e.user == User.current %>
<% if e.user == User.current %> <tr>
<td colspan="2" valign="top"> <td colspan="2" valign="top">
<strong> <strong>
<%= link_to("#{l(:label_i)}", user_path(e.user_id)) %> <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %>
@ -445,20 +447,42 @@
:action => 'show', :action => 'show',
:id => act.id} %> :id => act.id} %>
</td> </td>
<% else %> </tr>
<td colspan="2" valign="top"> <tr>
<strong> <td colspan="2" width="580" style="WORD-BREAK: break-all; WORD-WRAP: break-word">
<%= link_to(h(e.user), user_path(e.user_id)) %> <%= textAreailizable act, :description %>
</strong>&nbsp; </td>
<span class="font_lighter"> </tr>
<%= l(:label_new_activity) %> <tr>
</span>&nbsp; <td>
<%= link_to format_activity_title("#{act.source_from} (#{act.status}): #{act.tracker.name} #{act.subject}"), <div style="display: inline-block; float: left; margin-top: 0px" width="200" align="right" class="a">
{:controller => 'issues', <span class="font_lighter">
:action => 'show', <%= (l(:label_update_time).to_s << ':' << format_time(e.act.created_on)).to_s %>
:id => act.id} %> </span>
</td> </div>
<% end %> <div style="display: inline-block; float: right; margin-top: 0px">
<span>
<%= link_to l(:label_find_all_comments), {:controller => 'issues', :action => 'show', :id => act.id} %>
</span>
<a class="font_lighter">
<%= l(:label_comments_count, :count => e.act.journals.count) %>
</a>
</div>
</td>
</tr>
<% else %>
<td colspan="2" valign="top">
<strong>
<%= link_to(h(e.user), user_path(e.user_id)) %>
</strong>&nbsp;
<span class="font_lighter">
<%= l(:label_new_activity) %>
</span>&nbsp;
<%= link_to format_activity_title("#{act.source_from} (#{act.status}): #{act.tracker.name} #{act.subject}"),
{:controller => 'issues',
:action => 'show',
:id => act.id} %>
</td>
</tr> </tr>
<tr> <tr>
<td colspan="2" width="580" style="WORD-BREAK: break-all; WORD-WRAP: break-word"> <td colspan="2" width="580" style="WORD-BREAK: break-all; WORD-WRAP: break-word">
@ -482,6 +506,9 @@
</div> </div>
</td> </td>
</tr> </tr>
<% end %>
<% when 'Contest' %> <% when 'Contest' %>
<tr> <tr>
<% if e.user == User.current && @show_contest == 1%> <% if e.user == User.current && @show_contest == 1%>
@ -531,7 +558,9 @@
</td> </td>
</tr> </tr>
</table> </table>
<% end %>
<% end %>
<% end %><!-- < % #unless act.nil? end %> --> <% end %><!-- < % #unless act.nil? end %> -->
<% end %><!-- < % #@activity.each do |e| end%> --> <% end %><!-- < % #@activity.each do |e| end%> -->
</div> </div>

Write Preview
Loading…
Cancel
Save