floraachy
/
gitlink-forgeplus
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases 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 private
def start_stamp def start_stamp
if params[:year].present? 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 else
Date.today.to_time.to_i - 365*24*60*60 (Date.today - 1.years).to_time.to_i
end end
end end
def end_stamp def end_stamp
if params[:year].present? 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 else
Date.today.to_time.to_i Date.today.to_time.to_i
end end

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

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