andis/fetsite
1
0
Fork 0
forked from bofh/fetsite
Code Issues Pull Requests Releases Wiki Activity

Revert "change meetings"

Browse Source 
This reverts commit 585b386e7c.

Conflicts:
	app/controllers/neuigkeiten_controller.rb
This commit is contained in:
Andreas Stephanides
2015-01-17 12:16:37 +01:00
parent 9ffebfd4e7
commit 3c2250b4fc
45 changed files with 1 additions and 1046 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
app/controllers/fetmeetings_controller.rb
View File

@@ -1,84 +0,0 @@
class FetmeetingsController < ApplicationController
# GET /fetmeetings
# GET /fetmeetings.json
def index
@fetmeetings = Fetmeeting.all
respond_to do |format|
format.html # index.html.erb
format.json { render json: @fetmeetings }
end
end
# GET /fetmeetings/1
# GET /fetmeetings/1.json
def show
@fetmeeting = Fetmeeting.find(params[:id])
respond_to do |format|
format.html # show.html.erb
format.json { render json: @fetmeeting }
end
end
# GET /fetmeetings/new
# GET /fetmeetings/new.json
def new
@fetmeeting = Fetmeeting.new
@fetmeeting.calentry=Calentry.new(typ: 0, object: @fetmeetings)
respond_to do |format|
format.html # new.html.erb
format.json { render json: @fetmeeting }
end
end
# GET /fetmeetings/1/edit
def edit
@fetmeeting = Fetmeeting.find(params[:id])
end
# POST /fetmeetings
# POST /fetmeetings.json
def create
@fetmeeting = Fetmeeting.new(params[:fetmeeting])
respond_to do |format|
if @fetmeeting.save
format.html { redirect_to @fetmeeting, notice: 'Fetmeeting was successfully created.' }
format.json { render json: @fetmeeting, status: :created, location: @fetmeeting }
else
format.html { render action: "new" }
format.json { render json: @fetmeeting.errors, status: :unprocessable_entity }
end
end
end
# PUT /fetmeetings/1
# PUT /fetmeetings/1.json
def update
@fetmeeting = Fetmeeting.find(params[:id])
respond_to do |format|
if @fetmeeting.update_attributes(params[:fetmeeting])
format.html { redirect_to @fetmeeting, notice: 'Fetmeeting was successfully updated.' }
format.json { head :no_content }
else
format.html { render action: "edit" }
format.json { render json: @fetmeeting.errors, status: :unprocessable_entity }
end
end
end
# DELETE /fetmeetings/1
# DELETE /fetmeetings/1.json
def destroy
@fetmeeting = Fetmeeting.find(params[:id])
@fetmeeting.destroy
respond_to do |format|
format.html { redirect_to fetmeetings_url }
format.json { head :no_content }
end
end
end

83
app/controllers/fetmeetingtops_controller.rb
View File

@@ -1,83 +0,0 @@
class FetmeetingtopsController < ApplicationController
# GET /fetmeetingtops
# GET /fetmeetingtops.json
def index
@fetmeetingtops = Fetmeetingtop.all
respond_to do |format|
format.html # index.html.erb
format.json { render json: @fetmeetingtops }
end
end
# GET /fetmeetingtops/1
# GET /fetmeetingtops/1.json
def show
@fetmeetingtop = Fetmeetingtop.find(params[:id])
respond_to do |format|
format.html # show.html.erb
format.json { render json: @fetmeetingtop }
end
end
# GET /fetmeetingtops/new
# GET /fetmeetingtops/new.json
def new
@fetmeetingtop = Fetmeetingtop.new
respond_to do |format|
format.html # new.html.erb
format.json { render json: @fetmeetingtop }
end
end
# GET /fetmeetingtops/1/edit
def edit
@fetmeetingtop = Fetmeetingtop.find(params[:id])
end
# POST /fetmeetingtops
# POST /fetmeetingtops.json
def create
@fetmeetingtop = Fetmeetingtop.new(params[:fetmeetingtop])
respond_to do |format|
if @fetmeetingtop.save
format.html { redirect_to @fetmeetingtop, notice: 'Fetmeetingtop was successfully created.' }
format.json { render json: @fetmeetingtop, status: :created, location: @fetmeetingtop }
else
format.html { render action: "new" }
format.json { render json: @fetmeetingtop.errors, status: :unprocessable_entity }
end
end
end
# PUT /fetmeetingtops/1
# PUT /fetmeetingtops/1.json
def update
@fetmeetingtop = Fetmeetingtop.find(params[:id])
respond_to do |format|
if @fetmeetingtop.update_attributes(params[:fetmeetingtop])
format.html { redirect_to @fetmeetingtop, notice: 'Fetmeetingtop was successfully updated.' }
format.json { head :no_content }
else
format.html { render action: "edit" }
format.json { render json: @fetmeetingtop.errors, status: :unprocessable_entity }
end
end
end
# DELETE /fetmeetingtops/1
# DELETE /fetmeetingtops/1.json
def destroy
@fetmeetingtop = Fetmeetingtop.find(params[:id])
@fetmeetingtop.destroy
respond_to do |format|
format.html { redirect_to fetmeetingtops_url }
format.json { head :no_content }
end
end
end

2
app/controllers/neuigkeiten_controller.rb
View File

@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
class NeuigkeitenController < ApplicationController
class NeuigkeitenController < ApplicationController
before_filter :load_toolbar_elements, :only=>[:show,:find_link]
before_filter :load_toolbar_elements_edit, :only=>[:edit]