scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-10-09 05:18:01 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1669 from okriuchykhin/ok_SCI_3340

Browse source 
Fix crash when no activities present [SCI-3340]
This commit is contained in:
Alex Kriuchykhin 2019-04-15 11:13:25 +02:00 • committed by GitHub
commit a61d637e6d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/global_activities_controller.rb
View file

@ -49,7 +49,7 @@ class GlobalActivitiesController < ApplicationController
end end
@next_page = activities.next_page @next_page = activities.next_page
@starting_timestamp = activities.first.created_at.to_i @starting_timestamp = activities.first&.created_at.to_i
respond_to do |format| respond_to do |format|
format.json do format.json do

2
app/controllers/my_modules_controller.rb
View file

@ -90,7 +90,7 @@ class MyModulesController < ApplicationController
end end
@next_page = activities.next_page @next_page = activities.next_page
@starting_timestamp = activities.first.created_at.to_i @starting_timestamp = activities.first&.created_at.to_i
respond_to do |format| respond_to do |format|
format.json do format.json do