diff --git a/app/controllers/gremien_controller.rb b/app/controllers/gremien_controller.rb index 981f71a..042bafc 100644 --- a/app/controllers/gremien_controller.rb +++ b/app/controllers/gremien_controller.rb @@ -1,9 +1,11 @@ class GremienController < ApplicationController # GET /gremien # GET /gremien.json + before_filter {@toolbar_elements=[]} def verwalten @gremien = Gremium.all - @gremientabs=Gremium.all + @gremientabs=Gremium.all + @toolbar_elements << {:text=>I18n.t('common.new'),:path=>new_gremium_path() ,:icon=>:plus} if can? :new, Gremium respond_to do |format| format.html # index.html.erb format.json { render json: @gremien } @@ -14,7 +16,7 @@ class GremienController < ApplicationController # GET /gremien/1.json def show @gremium = Gremium.find(params[:id]) - @gremientabs=Gremium.order(:typ) + @gremientabs=Gremium.order(:typ) respond_to do |format| format.html # show.html.erb format.json { render json: @gremium } diff --git a/app/models/gremium.rb b/app/models/gremium.rb index fbebb9b..9db41df 100644 --- a/app/models/gremium.rb +++ b/app/models/gremium.rb @@ -1,3 +1,4 @@ +# -*- coding: utf-8 -*- # == Schema Information # # Table name: gremien @@ -11,12 +12,13 @@ # class Gremium < ActiveRecord::Base - TYPEN={1=>"offiziell"} - GESCHLECHT={0=>"sächlich", 1 => "männlich", 2 => "weiblich"} + TYPEN={1=>"offiziell", 2=>"offiziell-temporär", 3 => "inoffiziell","inoffiziell-tempo"} + GESCHLECHT={0=>"saechlich", 1 => "maennlich", 2 => "weiblich"} ART2FALL={0=>"des", 1=>"des",2=>"der"} attr_accessible :desc, :name, :typ, :geschlecht,:thema_id has_many :memberships belongs_to :thema + scope :tabs, { .where(:typ=> 1,:typ=>2)} def fall2 Gremium::ART2FALL[self.geschlecht.to_i].to_s+" "+ self.name.to_s+ ((self.geschlecht.to_i==1||self.geschlecht.to_i==0)? "s":"") end diff --git a/config/routes.rb b/config/routes.rb index ab8426f..7d69e74 100755 --- a/config/routes.rb +++ b/config/routes.rb @@ -66,6 +66,7 @@ member do get 'verwalten' put 'addmoderator' + get 'removemoderator' end resources :neuigkeiten, :except => [:index] do member do