bofh/fetsite
9
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

uploader

Browse Source
This commit is contained in:
Thomas Blazek
2013-08-22 11:16:32 +02:00
parent a2f3608d8f
commit 09fc68eef0
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/fotos_controller.rb
View File

@@ -27,7 +27,6 @@ class FotosController < ApplicationController
@foto = Foto.new @foto = Foto.new
@gallery = Gallery.find_by_id(params[:gallery_id]) @gallery = Gallery.find_by_id(params[:gallery_id])
@foto.gallery_id = @gallery.id @foto.gallery_id = @gallery.id
@foto.datei=@original_filename
respond_to do |format| respond_to do |format|
format.html # new.html.erb format.html # new.html.erb
format.json { render json: @foto } format.json { render json: @foto }
@@ -44,10 +43,13 @@ class FotosController < ApplicationController
def create def create
@foto = Foto.new(params[:foto]) @foto = Foto.new(params[:foto])
@foto.gallery_id = (params[:gallery_id])
@gallery = @foto.gallery
respond_to do |format| respond_to do |format|
@foto.title = @foto.datei
if @foto.save if @foto.save
format.html { redirect_to gallery_foto_path(@foto.gallery,@foto), notice: 'Foto was successfully created.' } format.html { redirect_to gallery_foto_path(@foto.gallery,@foto), notice: 'Foto was successfully created.' }
format.json { render json: gallery_foto_path(@foto.gallery,@foto), status: :created, location: @foto } format.json { render json: gallery_foto_path(@foto.gallery,@foto), status: :created, location: [@gallery, @foto] }
else else
format.html { render action: "new" } format.html { render action: "new" }
format.json { render json: @foto.errors, status: :unprocessable_entity } format.json { render json: @foto.errors, status: :unprocessable_entity }
@@ -78,7 +80,7 @@ class FotosController < ApplicationController
@foto.destroy @foto.destroy
respond_to do |format| respond_to do |format|
format.html { redirect_to fotos_url } format.html { redirect_to galleries_url }
format.json { head :no_content } format.json { head :no_content }
end end
end end

4
app/views/fotos/new.html.erb
View File

@@ -1,5 +1,5 @@
<h1>New foto</h1> <h1>New foto</h1>
<%= render 'form' %> <%= render 'form_bulk' %>
<%= link_to 'Back', fotos_path %> <%= link_to 'Back', gallery_fotos_path(params[:gallery_id]) %>

3
config/routes.rb
View File

@@ -36,9 +36,8 @@
get 'verwalten/studien', :controller=>:studien, :action=>:verwalten, :as=>'studien_verwalten' get 'verwalten/studien', :controller=>:studien, :action=>:verwalten, :as=>'studien_verwalten'
resources :fetzneditions resources :fetzneditions
resources :fotos, :except=>[:new, :show]
resources :galleries do resources :galleries do
resources :fotos, :only=>[:new,:show] resources :fotos
end end
resources :memberships, :except=>[:new, :show, :edit] resources :memberships, :except=>[:new, :show, :edit]
resources :gremien resources :gremien