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
mrg
[pettanr/pettanr.git]
/
app
/
controllers
/
folders_controller.rb
diff --git
a/app/controllers/folders_controller.rb
b/app/controllers/folders_controller.rb
index
b4b14cf
..
cbf5918
100644
(file)
--- a/
app/controllers/folders_controller.rb
+++ b/
app/controllers/folders_controller.rb
@@
-13,9
+13,15
@@
class FoldersController < ApplicationController
def root
set_model
@item = Folder.root
def root
set_model
@item = Folder.root
- respond_to do |format|
- children_html_format format
- children_json_format format
+ if params[:ref]
+ respond_to do |format|
+ show_json_format format
+ end
+ else
+ respond_to do |format|
+ children_html_format format
+ children_json_format format
+ end
end
end
end
end
@@
-51,13
+57,18
@@
class FoldersController < ApplicationController
show_json_format format
end
else
show_json_format format
end
else
- if @item.category_id == 10
- redirect_to @item.remote_name
- else
+ if params[:format] == 'prof'
respond_to do |format|
respond_to do |format|
- children_html_format format
show_prof_format format
show_prof_format format
- children_json_format format
+ end
+ else
+ if @item.category_id == 10
+ redirect_to @item.remote_name
+ else
+ respond_to do |format|
+ children_html_format format
+ children_json_format format
+ end
end
end
end
end
end
end