Gitlink
/
forgeplus
37
1
Fork 58
Code Issues 1 Pull Requests 1 Packages Releases 15 Wiki Activity

Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop

This commit is contained in:
xxq250 2023-02-27 16:02:13 +08:00
parent f8350c4043 895cd8f737
commit f59ab5bcf1
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/users/headmaps_controller.rb
View File

@ -10,15 +10,15 @@ class Users::HeadmapsController < Users::BaseController
private
def start_stamp
if params[:year].present?
Date.new(params[:year], 1).to_time.to_i
Date.new(params[:year].to_i, 1).to_time.to_i
else
Date.today.to_time.to_i - 365*24*60*60
(Date.today - 1.years).to_time.to_i
end
end
def end_stamp
if params[:year].present?
Date.new(params[:year], 1).to_time.to_i + 365*24*60*60
(Date.new(params[:year].to_i, 1) + 1.years).to_time.to_i
else
Date.today.to_time.to_i
end

5
app/controllers/users/messages_controller.rb
View File

@ -1,6 +1,7 @@
class Users::MessagesController < Users::BaseController
before_action :private_user_resources!
before_action :find_receivers, only: [:create]
before_action :check_auth
def index
limit = params[:limit] || params[:per_page]
@ -63,6 +64,10 @@ class Users::MessagesController < Users::BaseController
end
private
def check_auth
return render_forbidden unless current_user.admin? || observed_logged_user?
end
def message_type
@message_type = begin
case params[:type]