From cd595646d87269037039f1fae12427d9e62f7965 Mon Sep 17 00:00:00 2001 From: qyzh Date: Mon, 9 Nov 2020 20:42:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E8=B5=9E=E5=8A=A9=E5=85=B3=E7=B3=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/log_controller.rb | 2 +- app/controllers/sponsor_tiers_controller.rb | 1 + app/controllers/sponsorships_controller.rb | 12 ++++++++++-- .../{file_list.json.jbuilder => list.json.jbuilder} | 0 app/views/sponsor_tiers/show.json.jbuilder | 10 +++++++++- app/views/sponsorships/sponsored.json.jbuilder | 1 + app/views/sponsorships/sponsoring.json.jbuilder | 1 + .../sponsorships/stopped_sponsored.json.jbuilder | 1 + .../sponsorships/stopped_sponsoring.json.jbuilder | 1 + config/routes.rb | 9 +++++---- 10 files changed, 30 insertions(+), 8 deletions(-) rename app/views/log/{file_list.json.jbuilder => list.json.jbuilder} (100%) diff --git a/app/controllers/log_controller.rb b/app/controllers/log_controller.rb index 8a078b43..ca23bde2 100644 --- a/app/controllers/log_controller.rb +++ b/app/controllers/log_controller.rb @@ -1,5 +1,5 @@ class LogController < ApplicationController - def file_list + def list path = "#{Rails.root}/log" @file_list = [] Dir.foreach(path) do |file| diff --git a/app/controllers/sponsor_tiers_controller.rb b/app/controllers/sponsor_tiers_controller.rb index 423a3f70..ccf21cc4 100644 --- a/app/controllers/sponsor_tiers_controller.rb +++ b/app/controllers/sponsor_tiers_controller.rb @@ -12,6 +12,7 @@ class SponsorTiersController < ApplicationController # GET /sponsor_tiers/1 # GET /sponsor_tiers/1.json def show + @check_sponsorship = Sponsorship.where("sponsor_id=? AND developer_id=?", current_user.id, @sponsor_tier.user) end # GET /sponsor_tiers/new diff --git a/app/controllers/sponsorships_controller.rb b/app/controllers/sponsorships_controller.rb index 7c500071..0a02df40 100644 --- a/app/controllers/sponsorships_controller.rb +++ b/app/controllers/sponsorships_controller.rb @@ -73,8 +73,8 @@ class SponsorshipsController < ApplicationController @sponsorship = Sponsorship.new(sponsorship_params.merge({sponsor_id: sponsor_id})) # print('#######################', params[:single].class) - unless check_sponsorship.length.zero? || params[:single] - return render json: {status: -1, message: '您已赞助了TA' } + unless check_sponsorship.length.zero? + return render json: {status: -1, message: '您已经赞助了TA' } end if @sponsorship.pay && @sponsorship.save @@ -113,6 +113,14 @@ class SponsorshipsController < ApplicationController # format.json { render json: @sponsorship.errors, status: :unprocessable_entity } # end # end + if @sponsorship.sponsor.id != current_user.id + return render json: {status: -1, message: '没有权限' } + end + if @sponsorship.update(sponsorship_params) + render json: {status: 1, message: '修改成功' } + else + render json: {status: -1, message: '修改失败' } + end end # DELETE /sponsorships/1 diff --git a/app/views/log/file_list.json.jbuilder b/app/views/log/list.json.jbuilder similarity index 100% rename from app/views/log/file_list.json.jbuilder rename to app/views/log/list.json.jbuilder diff --git a/app/views/sponsor_tiers/show.json.jbuilder b/app/views/sponsor_tiers/show.json.jbuilder index 9244b22f..5b32c1e1 100644 --- a/app/views/sponsor_tiers/show.json.jbuilder +++ b/app/views/sponsor_tiers/show.json.jbuilder @@ -1 +1,9 @@ -json.partial! "sponsor_tiers/sponsor_tier", sponsor_tier: @sponsor_tier +json.tier do + json.partial! "sponsor_tiers/sponsor_tier", sponsor_tier: @sponsor_tier +end +if @check_sponsorship.length.zero? + json.is_sponsoring false +else + json.is_sponsoring true + json.sponsorship_id @check_sponsorship[0].id +end diff --git a/app/views/sponsorships/sponsored.json.jbuilder b/app/views/sponsorships/sponsored.json.jbuilder index 199ff8b7..ceac4b23 100644 --- a/app/views/sponsorships/sponsored.json.jbuilder +++ b/app/views/sponsorships/sponsored.json.jbuilder @@ -16,5 +16,6 @@ json.sponsorships do json.user_id sponsor.id json.login sponsor.login json.accumulate sponsorship.accumulate + json.sponsor_id sponsorship.sponsor.id end end diff --git a/app/views/sponsorships/sponsoring.json.jbuilder b/app/views/sponsorships/sponsoring.json.jbuilder index 99582b11..39a4027a 100644 --- a/app/views/sponsorships/sponsoring.json.jbuilder +++ b/app/views/sponsorships/sponsoring.json.jbuilder @@ -16,5 +16,6 @@ json.sponsorships do json.user_id sponsor.id json.login sponsor.login json.accumulate sponsorship.accumulate + json.sponsor_id sponsorship.sponsor.id end end diff --git a/app/views/sponsorships/stopped_sponsored.json.jbuilder b/app/views/sponsorships/stopped_sponsored.json.jbuilder index 1a44ef59..cd06cb6c 100644 --- a/app/views/sponsorships/stopped_sponsored.json.jbuilder +++ b/app/views/sponsorships/stopped_sponsored.json.jbuilder @@ -16,5 +16,6 @@ json.sponsorships do json.user_id sponsor.id json.login sponsor.login json.accumulate sponsorship.accumulate + json.sponsor_id sponsorship.sponsor.id end end \ No newline at end of file diff --git a/app/views/sponsorships/stopped_sponsoring.json.jbuilder b/app/views/sponsorships/stopped_sponsoring.json.jbuilder index 642452c5..fb3b0f9c 100644 --- a/app/views/sponsorships/stopped_sponsoring.json.jbuilder +++ b/app/views/sponsorships/stopped_sponsoring.json.jbuilder @@ -16,5 +16,6 @@ json.sponsorships do json.user_id sponsor.id json.login sponsor.login json.accumulate sponsorship.accumulate + json.sponsor_id sponsorship.sponsor.id end end \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 32419b48..a87cfe45 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -19,8 +19,9 @@ Rails.application.routes.draw do get 'wallets/balance' get 'wallets/coin_changes' - get 'log/file_list' - post 'log/download' + get 'log/list', to: 'log#list' + # post 'log/download', to: 'log#download' + match 'log/download/:filename' => 'log#download', :constraints => { filename: /[0-z\.]+/ }, via:[:get] resources :sponsor_tiers resources :sponsorships do @@ -230,7 +231,7 @@ Rails.application.routes.draw do resources :repositories, only: [:index, :show, :edit] do member do get :entries - match :sub_entries, :via => [:get, :put] + match :sub_entries, via: [:get, :put] get :commits post :files get :tags @@ -265,7 +266,7 @@ Rails.application.routes.draw do resources :courses do member do - get 'settings', :action => 'settings', :as => 'settings' + get 'settings', action: 'settings', as: 'settings' post 'set_invite_code_halt' post 'set_public_or_private' post 'search_teacher_candidate'