Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ end

group :development do
gem 'faker'

gem 'brakeman'
gem 'bundler-audit' #检查有没有套件有已知的漏洞需要升级
# Access an IRB console on exception pages or by using <%= console %> anywhere in the code.
gem 'web-console', '>= 3.3.0'
gem 'listen', '~> 3.0.5'
Expand Down
14 changes: 10 additions & 4 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,11 @@ GEM
bootstrap-sass (3.3.7)
autoprefixer-rails (>= 5.2.1)
sass (>= 3.3.4)
brakeman (3.7.2)
builder (3.2.3)
bundler-audit (0.6.0)
bundler (~> 1.2)
thor (~> 0.18)
byebug (9.0.6)
coffee-rails (4.2.1)
coffee-script (>= 2.2.0)
Expand Down Expand Up @@ -89,12 +93,12 @@ GEM
mime-types (3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mini_portile2 (2.1.0)
mini_portile2 (2.2.0)
minitest (5.10.1)
multi_json (1.12.1)
nio4r (2.0.0)
nokogiri (1.7.1)
mini_portile2 (~> 2.1.0)
nokogiri (1.8.0)
mini_portile2 (~> 2.2.0)
orm_adapter (0.5.0)
puma (3.8.2)
rack (2.0.1)
Expand Down Expand Up @@ -192,6 +196,8 @@ PLATFORMS

DEPENDENCIES
bootstrap-sass
brakeman
bundler-audit
byebug
coffee-rails (~> 4.2)
devise
Expand All @@ -212,4 +218,4 @@ DEPENDENCIES
web-console (>= 3.3.0)

BUNDLED WITH
1.14.6
1.15.3
2 changes: 1 addition & 1 deletion app/controllers/application_controller.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
class ApplicationController < ActionController::Base

# protect_from_forgery with: :exception
protect_from_forgery with: :exception

helper_method :current_cart

Expand Down
4 changes: 2 additions & 2 deletions app/controllers/events_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ def show
@comments = @event.comments

if params[:keyword]
@comments = @comments.where( "comments.content LIKE '%#{params[:keyword]}%'")
@comments = @comments.where( "comments.content LIKE ?", "%#{params[:keyword]}%")
end

if params[:sort]
if params[:sort] && ["id DESC", "id ASC"].include?(params[:sort]) # 只有白名单内的参数可以用
@comments = @comments.order(params[:sort])
end

Expand Down
2 changes: 1 addition & 1 deletion app/controllers/users_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ def update
protected

def user_params
params.require(:user).permit(:nickname, :role)
params.require(:user).permit(:nickname)
end

end
7 changes: 4 additions & 3 deletions app/helpers/users_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@ def user_avatar_link(user)
email_md5 = Digest::MD5.hexdigest(user.email)
gravatar_url = "https://www.gravatar.com/avatar/#{email_md5}"

str = "<div class ='user-link'>" + link_to(image_tag(gravatar_url), user_path(user)) + " " + user.display_name + "</div>"

str.html_safe
# "<div class ='user-link'>".html_safe + link_to(image_tag(gravatar_url), user_path(user)) + " " + user.display_name + "</div>".html_safe
content_tag(:div,
link_to(image_tag(gravatar_url), user_path(user)) + " " + user.display_name ,
:class => "user-link" )
end

end
6 changes: 3 additions & 3 deletions app/views/events/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@
</div>

<div class="panel-body">
<%= raw comment.content %>
<%= sanitize comment.content %>
</div>

<div class="panel-footer text-right">
<%= comment.created_at.to_s %>

<% if current_user && current_user.is_admin? %>
<%= link_to "Highligh", highlight_event_comment_path(@event, comment), :class => "btn btn-default" %>
<%= link_to "Highligh", highlight_event_comment_path(@event, comment), :method => :post, :class => "btn btn-default" %>
<% end %>

<% if comment.can_deleted_by(current_user) %>
Expand All @@ -50,4 +50,4 @@
<div class="form-group">
<%= f.submit "Comment", :class => "btn btn-primary" %>
</div>
<% end %>
<% end %>
2 changes: 1 addition & 1 deletion config/routes.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
resources :events do
resources :comments do
member do
get :highlight
post :highlight
end
end
end
Expand Down