From 5204ac22e62cbed768f27d5e7ea42cc85123f1c2 Mon Sep 17 00:00:00 2001 From: yasushiito Date: Wed, 23 Apr 2014 11:53:49 +0900 Subject: [PATCH] test sb extend data --- app/assets/javascripts/manifest/work/items.js.coffee.erb | 2 ++ app/controllers/balloons_controller.rb | 1 + app/controllers/pictures_controller.rb | 9 +++++++++ app/controllers/speech_balloons_controller.rb | 1 + app/controllers/speeches_controller.rb | 1 + app/models/balloon.rb | 2 +- app/models/speech.rb | 2 +- app/models/speech_balloon.rb | 2 +- lib/locmare/booster.rb | 4 ++++ lib/validators/boost_validator.rb | 2 +- public/manifest.json | 8 ++++++-- 11 files changed, 28 insertions(+), 6 deletions(-) diff --git a/app/assets/javascripts/manifest/work/items.js.coffee.erb b/app/assets/javascripts/manifest/work/items.js.coffee.erb index 39ebab39..52a77b3d 100644 --- a/app/assets/javascripts/manifest/work/items.js.coffee.erb +++ b/app/assets/javascripts/manifest/work/items.js.coffee.erb @@ -65,6 +65,7 @@ parent_model_name: 'speech_balloon', boost: { speech_balloon_template: { + extend_item_name: 'balloon', }, }, }, @@ -77,6 +78,7 @@ writing_format: { }, speech_balloon_template: { + extend_item_name: 'speech', }, }, }, diff --git a/app/controllers/balloons_controller.rb b/app/controllers/balloons_controller.rb index d7d49366..d4f94aee 100644 --- a/app/controllers/balloons_controller.rb +++ b/app/controllers/balloons_controller.rb @@ -25,6 +25,7 @@ class BalloonsController < ApplicationController def show_html_format format format.html { + @item.boosts 'post' @balloon = @item } end diff --git a/app/controllers/pictures_controller.rb b/app/controllers/pictures_controller.rb index 9e1bae8c..b4c6d8e4 100644 --- a/app/controllers/pictures_controller.rb +++ b/app/controllers/pictures_controller.rb @@ -7,6 +7,15 @@ class PicturesController < ApplicationController before_filter :authenticate_resource_reader, :only => [:show, :credit, :search] before_filter :authenticate_author, :only => [] end + before_filter :authenticate_admin, :only => [:index] + + def self.model + Picture + end + + def index + filer_list + end def show_html_format format format.html { diff --git a/app/controllers/speech_balloons_controller.rb b/app/controllers/speech_balloons_controller.rb index a1551f28..4198beca 100644 --- a/app/controllers/speech_balloons_controller.rb +++ b/app/controllers/speech_balloons_controller.rb @@ -28,6 +28,7 @@ class SpeechBalloonsController < ApplicationController def show_html_format format format.html { + @item.boosts 'post' @speech_balloon = @item } end diff --git a/app/controllers/speeches_controller.rb b/app/controllers/speeches_controller.rb index db947ad1..2ee6880a 100644 --- a/app/controllers/speeches_controller.rb +++ b/app/controllers/speeches_controller.rb @@ -29,6 +29,7 @@ class SpeechesController < ApplicationController def show_html_format format format.html { + @item.boosts 'post' @speech = @item } end diff --git a/app/models/balloon.rb b/app/models/balloon.rb index f3f9460e..c79616d1 100644 --- a/app/models/balloon.rb +++ b/app/models/balloon.rb @@ -14,7 +14,7 @@ class Balloon < Peta::Element validates :height, :presence => true, :numericality => true, :natural_number => true validates :r, :presence => true, :numericality => true # validates :caption, :presence => true - validates :speech_balloon_template_settings, :boost => {:resource_name => :speech_balloon_template} + validates :speech_balloon_template_settings, :boost => {:boost_name => :speech_balloon_template} def url '/system_pictures/' + self.system_picture.filename diff --git a/app/models/speech.rb b/app/models/speech.rb index 076c80de..24fc43b9 100644 --- a/app/models/speech.rb +++ b/app/models/speech.rb @@ -17,7 +17,7 @@ class Speech < Peta::Element validates :width, :presence => true, :numericality => true, :natural_number => true validates :height, :presence => true, :numericality => true, :natural_number => true validates :quotes, :length => {:maximum => 15}, :quotes_even => true - validates :speech_balloon_template_settings, :boost => {:resource_name => :speech_balloon_template} + validates :speech_balloon_template_settings, :boost => {:boost_name => :speech_balloon_template} #validates :writing_format_settings @@text_align_texts = ['left', 'left', 'right', 'center'] diff --git a/app/models/speech_balloon.rb b/app/models/speech_balloon.rb index d5a41488..88073cdb 100644 --- a/app/models/speech_balloon.rb +++ b/app/models/speech_balloon.rb @@ -13,7 +13,7 @@ class SpeechBalloon < Peta::Element validates :speech_balloon_template_classname, :presence => true, :length => {:maximum => 50} validates :z, :presence => true, :numericality => {:greater_than => 0} validates :t, :presence => true, :numericality => {:greater_than_or_equal_to => 0} - validates :speech_balloon_template_settings, :boost => {:resource_name => :speech_balloon_template} + validates :speech_balloon_template_settings, :boost => {:boost_name => :speech_balloon_template} def self.by_author_list_includes { diff --git a/lib/locmare/booster.rb b/lib/locmare/booster.rb index a8201d4a..0f4dee54 100644 --- a/lib/locmare/booster.rb +++ b/lib/locmare/booster.rb @@ -97,6 +97,10 @@ module Locmare end end + def update_settings new_settings + @item.__send__ @manifest.setter_method_name, new_settings + end + end end diff --git a/lib/validators/boost_validator.rb b/lib/validators/boost_validator.rb index 63ad5afe..530e282e 100644 --- a/lib/validators/boost_validator.rb +++ b/lib/validators/boost_validator.rb @@ -1,6 +1,6 @@ class BoostValidator < ActiveModel::EachValidator def validate_each(record, attribute, value) - rec = record.boosters[options[:resource_name].to_s].extend_item + rec = record.boosters[options[:boost_name].to_s].extend_item msg = options[:message] || I18n.t('activerecord.errors.messages.extend_settings') record.errors[attribute] << msg unless rec.valid? end diff --git a/public/manifest.json b/public/manifest.json index fb4b3ed9..1f176210 100644 --- a/public/manifest.json +++ b/public/manifest.json @@ -58,7 +58,9 @@ "args": { "parent_model_name": "speech_balloon", "boost": { - "speech_balloon_template": {} + "speech_balloon_template": { + "extend_item_name": "balloon" + } } } }, @@ -68,7 +70,9 @@ "parent_model_name": "speech_balloon", "boost": { "writing_format": {}, - "speech_balloon_template": {} + "speech_balloon_template": { + "extend_item_name": "speech" + } } } }, -- 2.11.0