X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=app%2Fcontrollers%2Fspeeches_controller.rb;h=fb37d6622a293f7b34e0c21af67b6dc2f3bee7b8;hb=3f39d78e1a786b269960e57530eed81802920e6c;hp=b9a3c7b55a336b3f1f5e4803c0be1ac3ccca9d9c;hpb=c0ea68c9b95c71485cb917d82b362cb000b933e0;p=pettanr%2Fpettanr.git diff --git a/app/controllers/speeches_controller.rb b/app/controllers/speeches_controller.rb index b9a3c7b5..fb37d662 100644 --- a/app/controllers/speeches_controller.rb +++ b/app/controllers/speeches_controller.rb @@ -1,25 +1,59 @@ class SpeechesController < ApplicationController - layout 'test' if MagicNumber['test_layout'] - before_filter :authenticate_user!, :only => [:index, :show] - before_filter :authenticate_admin!, :only => [:list, :browse] - - # GET /speeches - # GET /speeches.json + if Manifest.manifest.magic_numbers['run_mode'] == 0 + before_filter :authenticate_user, :only => [:new, :edit, :create, :update, :destroy] + before_filter :authenticate_author, :only => [:new, :edit, :create, :update, :destroy] + else + before_filter :authenticate_reader, :only => [ + :index, :show, + :by_author, :by_speech_balloon, :by_speech_balloon_template, :by_writing_format + ] + before_filter :authenticate_user, :only => [:new, :edit, :create, :update, :destroy] + before_filter :authenticate_author, :only => [:new, :edit, :create, :update, :destroy] + end + before_filter :authenticate_admin!, :only => [] + def index - @speeches = Speech.all - - respond_to do |format| - format.html # index.html.erb - format.json { render json: @speeches } - end + filer_list + end + + def by_author + filer_list + end + + def by_speech_balloon + filer_list end - - def list - @speeches = Speech.all - + + def by_speech_balloon_template + filer_list + end + + def by_writing_format + filer_list + end + + def show_html_format format + format.html { + @item.boosts 'post' + @speech = @item + } + end + + def show + set_show respond_to do |format| - format.html { render layout: 'system' } - format.json { render json: @speeches } + show_html_format format + show_prof_format format + show_json_format format end end + + def new + form_new + end + + def edit + form_edit + end + end