OSDN Git Service
(root)
/
pettanr
/
pettanr.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rename model name
[pettanr/pettanr.git]
/
app
/
controllers
/
speech_balloon_templates_controller.rb
diff --git
a/app/controllers/speech_balloon_templates_controller.rb
b/app/controllers/speech_balloon_templates_controller.rb
index
c89db4b
..
0b2d024
100644
(file)
--- a/
app/controllers/speech_balloon_templates_controller.rb
+++ b/
app/controllers/speech_balloon_templates_controller.rb
@@
-1,58
+1,63
@@
class SpeechBalloonTemplatesController < ApplicationController
class SpeechBalloonTemplatesController < ApplicationController
- layout 'test' if MagicNumber['test_layout']
- if MagicNumber['run_mode'] == 0
+ if Manifest.manifest.magic_numbers['run_mode'] == 0
before_filter :authenticate_user, :only => []
else
before_filter :authenticate_user, :only => []
else
- before_filter :authenticate_reader, :only => [:index, :show]
+ before_filter :authenticate_reader, :only => [
+ :index, :show, :by_panel, :by_system_picture, :count, :count_by_panel, :count_by_system_picture
+ ]
before_filter :authenticate_user, :only => []
end
before_filter :authenticate_user, :only => []
end
- before_filter :authenticate_admin!, :only => [:list, :browse, :destroy]
-
- @@model = SpeechBalloonTemplate
+ before_filter :authenticate_admin, :only => [:new, :create, :edit, :update, :destroy]
+
def index
def index
- set_filer
-
- respond_to do |format|
- format_filer format
- format.json { render json: @items.to_json(@@model.list_json_opt) }
- end
+ filer_list
end
end
-
+
+ def by_panel
+ filer_list
+ end
+
+ def by_system_picture
+ filer_list
+ end
+
+ def show_html_format format
+ format.html {
+ }
+ end
+
def show
def show
- @item = SpeechBalloonTemplate.show(params[:id], @operators)
-
+ set_show
respond_to do |format|
respond_to do |format|
- format.html {
- @speech_balloon_template = @item
- }
- format_prof format
- format.json {
- render :json => @item.to_json(SpeechBalloonTemplate.show_json_opt)
- }
+ show_html_format format
+ show_prof_format format
+ show_json_format format
end
end
end
end
-
- def list
- @speech_balloon_templates = SpeechBalloonTemplate.all
-
- respond_to do |format|
- format.html { render layout: 'system' }
- format.json { render json: @speech_balloon_templates }
- end
+
+ def count
+ list_count
end
end
-
- def browse
- @speech_balloon_template = SpeechBalloonTemplate.find(params[:id])
-
- respond_to do |format|
- format.html { render layout: 'system' }
- format.json { render json: @speech_balloon_template }
- end
+
+ def count_by_panel
+ list_count
end
end
-
+
+ def count_by_system_picture
+ list_count
+ end
+
+ def new
+ form_new
+ end
+
+ def edit
+ form_edit
+ end
+
def destroy
def destroy
- @
speech_balloon_template
= SpeechBalloonTemplate.find(params[:id])
- @
speech_balloon_template
.destroy
+ @
item
= SpeechBalloonTemplate.find(params[:id])
+ @
item
.destroy
respond_to do |format|
format.html { redirect_to :action => :list }
respond_to do |format|
format.html { redirect_to :action => :list }