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

scaffoldsgesäubert

Browse Source
This commit is contained in:
Andreas Stephanides
2013-02-12 10:08:44 +01:00
parent d18c411a84
commit 232e6cefff
15 changed files with 88 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -14,3 +14,4 @@
# Ignore all logfiles and tempfiles.
/log/*.log
/tmp
/config/initializers/devise.rb

28
app/controllers/lvas_controller.rb
View File

@@ -1,24 +1,17 @@
class LvasController < ApplicationController
# GET /lvas
# GET /lvas.json
def index
@lvas = Lva.all
respond_to do |format|
format.html # index.html.erb
format.json { render json: @lvas }
end
end
# GET /lvas/1
# GET /lvas/1.json
def show
@lva = Lva.find(params[:id])
respond_to do |format|
format.html # show.html.erb
format.json { render json: @lva }
end
end
# GET /lvas/new
@@ -27,10 +20,7 @@ class LvasController < ApplicationController
@lva = Lva.new
modul=Modul.find(params[:modul_id])
@lva.modul<<modul
respond_to do |format|
format.html # new.html.erb
format.json { render json: @lva }
end
end
# GET /lvas/1/edit
@@ -46,10 +36,10 @@ class LvasController < ApplicationController
respond_to do |format|
if @lva.save
format.html { redirect_to @lva, notice: 'Lva was successfully created.' }
format.json { render json: @lva, status: :created, location: @lva }
else
format.html { render action: "new" }
format.json { render json: @lva.errors, status: :unprocessable_entity }
end
end
end
@@ -62,10 +52,10 @@ class LvasController < ApplicationController
respond_to do |format|
if @lva.update_attributes(params[:lva])
format.html { redirect_to @lva, notice: 'Lva was successfully updated.' }
format.json { head :no_content }
else
format.html { render action: "edit" }
format.json { render json: @lva.errors, status: :unprocessable_entity }
end
end
end
@@ -78,7 +68,7 @@ class LvasController < ApplicationController
respond_to do |format|
format.html { redirect_to lvas_url }
format.json { head :no_content }
end
end
end

23
app/controllers/modulgruppen_controller.rb
View File

@@ -1,6 +1,6 @@
class ModulgruppenController < ApplicationController
# GET /modulgruppen
# GET /modulgruppen.json
load_and_authorize_resource
def index
@@ -12,7 +12,7 @@ class ModulgruppenController < ApplicationController
end
# GET /modulgruppen/1
# GET /modulgruppen/1.json
def show
@modulgruppe = Modulgruppe.find(params[:id])
if !params[:studium_id].nil?
@@ -22,7 +22,7 @@ class ModulgruppenController < ApplicationController
end
# GET /modulgruppen/new
# GET /modulgruppen/new.json
def new
@modulgruppe = Modulgruppe.new
if !params[:studium_id].nil?
@@ -40,7 +40,7 @@ class ModulgruppenController < ApplicationController
end
# POST /modulgruppen
# POST /modulgruppen.json
def create
@modulgruppe = Modulgruppe.new(params[:modulgruppe])
if !params[:studium_id].nil?
@@ -51,39 +51,38 @@ class ModulgruppenController < ApplicationController
respond_to do |format|
if @modulgruppe.save
format.html { redirect_to @modulgruppe, notice: 'Modulgruppe was successfully created.' }
format.json { render json: @modulgruppe, status: :created, location: @modulgruppe }
else
format.html { render action: "new" }
format.json { render json: @modulgruppe.errors, status: :unprocessable_entity }
end
end
end
# PUT /modulgruppen/1
# PUT /modulgruppen/1.json
def update
@modulgruppe = Modulgruppe.find(params[:id])
respond_to do |format|
if @modulgruppe.update_attributes(params[:modulgruppe])
format.html { redirect_to @modulgruppe, notice: 'Modulgruppe was successfully updated.' }
format.json { head :no_content }
else
format.html { render action: "edit" }
format.json { render json: @modulgruppe.errors, status: :unprocessable_entity }
end
end
end
# DELETE /modulgruppen/1
# DELETE /modulgruppen/1.json
def destroy
@modulgruppe = Modulgruppe.find(params[:id])
@modulgruppe.destroy
respond_to do |format|
format.html { redirect_to modulgruppen_url }
format.json { head :no_content }
end
end
end

7
app/controllers/moduls_controller.rb
View File

@@ -83,9 +83,8 @@ class ModulsController < ApplicationController
@modul = Modul.find(params[:id])
@modul.destroy
respond_to do |format|
format.html { redirect_to moduls_path() }
format.json { head :no_content }
end
redirect_to moduls_path()
end
end

38
app/controllers/neuigkeiten_controller.rb
View File

@@ -1,70 +1,50 @@
class NeuigkeitenController < ApplicationController
# GET /neuigkeiten
# GET /neuigkeiten.json
def index
@neuigkeiten = Neuigkeit.all
respond_to do |format|
format.html # index.html.erb
format.json { render json: @neuigkeiten }
end
end
# GET /neuigkeiten/1
# GET /neuigkeiten/1.json
def show
@neuigkeit = Neuigkeit.find(params[:id])
respond_to do |format|
format.html # show.html.erb
format.json { render json: @neuigkeit }
end
end
# GET /neuigkeiten/new
# GET /neuigkeiten/new.json
def new
@neuigkeit = Neuigkeit.new
respond_to do |format|
format.html # new.html.erb
format.json { render json: @neuigkeit }
end
end
# GET /neuigkeiten/1/edit
def edit
@neuigkeit = Neuigkeit.find(params[:id])
end
# POST /neuigkeiten
# POST /neuigkeiten.json
def create
@neuigkeit = Neuigkeit.new(params[:neuigkeit])
respond_to do |format|
if @neuigkeit.save
format.html { redirect_to @neuigkeit, notice: 'Neuigkeit was successfully created.' }
format.json { render json: @neuigkeit, status: :created, location: @neuigkeit }
else
format.html { render action: "new" }
format.json { render json: @neuigkeit.errors, status: :unprocessable_entity }
end
end
end
# PUT /neuigkeiten/1
# PUT /neuigkeiten/1.json
def update
@neuigkeit = Neuigkeit.find(params[:id])
respond_to do |format|
if @neuigkeit.update_attributes(params[:neuigkeit])
format.html { redirect_to @neuigkeit, notice: 'Neuigkeit was successfully updated.' }
format.json { head :no_content }
else
format.html { render action: "edit" }
format.json { render json: @neuigkeit.errors, status: :unprocessable_entity }
end
end
end
@@ -77,7 +57,7 @@ class NeuigkeitenController < ApplicationController
respond_to do |format|
format.html { redirect_to neuigkeiten_url }
format.json { head :no_content }
end
end
end

51
app/controllers/rubriken_controller.rb
View File

@@ -1,68 +1,53 @@
class RubrikenController < ApplicationController
# GET /rubriken
# GET /rubriken.json
def index
@rubriken = Rubrik.all
respond_to do |format|
format.html # index.html.erb
format.json { render json: @rubriken }
end
end
# GET /rubriken/1
# GET /rubriken/1.json
def show
@rubrik = Rubrik.find(params[:id])
respond_to do |format|
format.html # show.html.erb
format.json { render json: @rubrik }
end
@moderatoren=User.with_role(:newsmoderator,@rubrik)
end
# GET /rubriken/new
# GET /rubriken/new.json
def new
@rubrik = Rubrik.new
respond_to do |format|
format.html # new.html.erb
format.json { render json: @rubrik }
end
end
# GET /rubriken/1/edit
def edit
@rubrik = Rubrik.find(params[:id])
end
# POST /rubriken
# POST /rubriken.json
def create
@rubrik = Rubrik.new(params[:rubrik])
respond_to do |format|
if @rubrik.save
format.html { redirect_to @rubrik, notice: 'Rubrik was successfully created.' }
format.json { render json: @rubrik, status: :created, location: @rubrik }
else
format.html { render action: "new" }
format.json { render json: @rubrik.errors, status: :unprocessable_entity }
end
end
end
# PUT /rubriken/1
# PUT /rubriken/1.json
def addmoderator
@rubrik = Rubrik.find(params[:id])
if current_user.has_role?(:newsadmin,@rubrik) || current_user.has_role?(:newsadmin)
User.find(params[:userid]).add_role(:newsmoderator, @rubrik)
if can? :addmoderator, @rubrik
if params[:moderator].nil?
current_user.add_role(:newsmoderator,@rubrik)
else
User.find(params[:moderator]).add_role(:newsmoderator, @rubrik)
end
response_notice= I18n.t("rubrik/moderatoradded")
else
response_notice= I18n.t("rubrik/moderatoraddnorights"
end
respond_to do |format|
format.html { redirect_to @rubrik }
format.html { redirect_to @rubrik,:notice => response_notice }
end
end
def update
@@ -84,10 +69,6 @@ class RubrikenController < ApplicationController
def destroy
@rubrik = Rubrik.find(params[:id])
@rubrik.destroy
respond_to do |format|
format.html { redirect_to rubriken_url }
format.json { head :no_content }
end
redirect_to rubriken_url
end
end

38
app/controllers/semesters_controller.rb
View File

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

36
app/controllers/studien_controller.rb
View File

@@ -1,35 +1,18 @@
class StudienController < ApplicationController
# GET /studia
# GET /studia.json
def index
@studien = Studium.all
respond_to do |format|
format.html # index.html.erb
format.json { render json: @studien }
end
end
# GET /studia/1
# GET /studia/1.json
def show
@studium= Studium.find(params[:id])
respond_to do |format|
format.html # show.html.erb
format.json { render json: @studium }
end
end
end
# GET /studia/new
# GET /studia/new.json
def new
@studium = Studium.new
respond_to do |format|
format.html # new.html.erb
format.json { render json: @studium }
end
end
# GET /studia/1/edit
@@ -53,18 +36,17 @@ class StudienController < ApplicationController
end
end
# PUT /studia/1
# PUT /studia/1.json
def update
@studium = Studium.find(params[:id])
respond_to do |format|
if @studium.update_attributes(params[:studium])
format.html { redirect_to @studium, notice: 'Studium was successfully updated.' }
format.json { head :no_content }
else
format.html { render action: "edit" }
format.json { render json: @studium.errors, status: :unprocessable_entity }
end
end
end
@@ -74,10 +56,6 @@ class StudienController < ApplicationController
def destroy
@studium = Studium.find(params[:id])
@studium.destroy
respond_to do |format|
format.html { redirect_to studien_url }
format.json { head :no_content }
end
redirect_to studien_url
end
end

3
app/controllers/users_controller.rb
View File

@@ -1,6 +1,5 @@
class UsersController < ApplicationController
def index
@users = User.all
end
end
end

2
app/models/ability.rb
View File

@@ -13,6 +13,8 @@ class Ability
can :read, Modulgruppe
if user.has_role? "newsadmin"
can :manage, Modulgruppe
can :addmoderator, Modulgruppe
can :addmoderator, Rubrik
end
# The first argument to `can` is the action you are giving the user permission to do.
# If you pass :manage it will apply to every action. Other common actions here are

5
app/models/rubrik.rb
View File

@@ -1,7 +1,12 @@
class Rubrik < ActiveRecord::Base
attr_accessible :desc, :name, :prio
has_many :neuigkeiten
resourcify
def moderator
u=User.with_role(:newsmoderator).first
if !u.nil?
u.id
end
end
def moderator=(id)

10
app/views/rubriken/show.html.erb
View File

@@ -14,9 +14,15 @@
<b>Prio:</b>
<%= @rubrik.prio %>
</p>
<%= semantic_form_for @rubrik, :url=> url_for(:action => 'addmoderator') do |f| %>
<b>Moderatoren:</b>
<% @moderatoren.each do |m|%>
<%= m.email%>
<% end%>
<%= semantic_form_for @rubrik, :url=> url_for(:action => 'addmoderator',:id=>@rubrik.id) do |f| %>
<%= f.inputs do %>
<%= f.input :moderator, :as => :select, :collection => Hash[User.all.map{|b| [b.email,b.id]}] %>
<%= f.input :moderator, :as => :select, :collection => Hash[User.all.map{|b| [b.email,b.id]}] ,:label=>"Hinzufügen"%>
<% end %>
<%= f.action :submit %>
<% end %>

2
config/initializers/devise.rb
View File

@@ -14,7 +14,7 @@ Devise.setup do |config|
:address => "smtp.gmail.com",
:port => 587,
:user_name => 'testruby12345@gmail.com',
:password => 't12345678',
:password => 'testtest987',
:authentication => 'plain',
:enable_starttls_auto => true }

4
config/locales/de.yml
View File

@@ -18,7 +18,9 @@ de:
studien: "Studien"
news: "News"
info: "Information"
rubrik:
moderatoradded: "Neuen Moderator hinzugefügt!"
moderatoraddnorights: "Keine Berechtigung neue Moderatoren hinzuzufügen!"
formtastic:
titles:
modul:

2
config/routes.rb
View File

@@ -26,7 +26,7 @@ end
get 'rubriken/addmoderator'
put 'rubriken/(:id)/addmoderator',:controller=>:rubriken,:action=>:addmoderator
resources :home