tildeverse/tilde.news
5
3
Fork 3
mirror of https://github.com/tildeverse/lobsters synced 2024-06-18 06:37:06 +00:00
Code Issues 2 Releases Wiki Activity

.touch idiom, don't fetch story twice

Browse Source
This commit is contained in:
Peter Bhat Harkins 2018-01-31 07:46:27 -06:00
parent dd42cca880
commit 13a0aad1f8
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/controllers/stories_controller.rb
View File

@ -119,8 +119,6 @@ class StoriesController < ApplicationController
end
def show
@story = Story.where(:short_id => params[:id]).first!
if @story.merged_into_story
flash[:success] = "\"#{@story.title}\" has been merged into this story."
return redirect_to @story.merged_into_story.comments_path
@ -411,10 +409,9 @@ private
end
def track_story_reads
story = Story.where(short_id: params[:id]).first!
@ribbon = ReadRibbon.where(user_id: @user.id, story_id: story.id).first_or_create
@story = Story.where(short_id: params[:id]).first!
@ribbon = ReadRibbon.where(user: @user, story: story).first_or_create
yield
@ribbon.updated_at = Time.now
@ribbon.save
@ribbon.touch
end
end