From cf132e20f5f5486551932155277b32abb69a076a Mon Sep 17 00:00:00 2001 From: Justin Edmund Date: Mon, 4 Apr 2022 23:41:00 -0700 Subject: [PATCH] Receive and output job data in templates --- app/controllers/api/v1/parties_controller.rb | 2 +- app/models/party.rb | 1 + app/views/api/v1/parties/base.json.rabl | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/controllers/api/v1/parties_controller.rb b/app/controllers/api/v1/parties_controller.rb index 12ecc3d..774b19d 100644 --- a/app/controllers/api/v1/parties_controller.rb +++ b/app/controllers/api/v1/parties_controller.rb @@ -118,6 +118,6 @@ class Api::V1::PartiesController < Api::V1::ApiController end def party_params - params.require(:party).permit(:user_id, :extra, :name, :description, :raid_id) + params.require(:party).permit(:user_id, :extra, :name, :description, :raid_id, :job_id) end end \ No newline at end of file diff --git a/app/models/party.rb b/app/models/party.rb index 20731ba..62db4e8 100644 --- a/app/models/party.rb +++ b/app/models/party.rb @@ -2,6 +2,7 @@ class Party < ApplicationRecord ##### ActiveRecord Associations belongs_to :user, optional: true belongs_to :raid, optional: true + belongs_to :job, optional: true has_many :characters, foreign_key: "party_id", diff --git a/app/views/api/v1/parties/base.json.rabl b/app/views/api/v1/parties/base.json.rabl index fabf183..42dfc00 100644 --- a/app/views/api/v1/parties/base.json.rabl +++ b/app/views/api/v1/parties/base.json.rabl @@ -14,6 +14,10 @@ node :raid do |p| partial('raids/base', :object => p.raid) end +node :job do |p| + partial('jobs/base', :object => p.job) +end + node :characters do |p| partial('grid_characters/base', :object => p.characters) end