diff --git a/app/controllers/fetprofiles_controller.rb b/app/controllers/fetprofiles_controller.rb index 79242f4..3790511 100644 --- a/app/controllers/fetprofiles_controller.rb +++ b/app/controllers/fetprofiles_controller.rb @@ -5,7 +5,7 @@ class FetprofilesController < ApplicationController @fetprofiles = Fetprofile.active.order(:vorname,:nachname) @fetprofiles = Fetprofile.order(:vorname,:nachname) if params[:filter]== "all" - @gremientabs=Gremium.order(:typ) + @gremientabs=Gremium.tabs respond_to do |format| format.html # index.html.erb format.json { render json: @fetprofiles } diff --git a/app/controllers/gremien_controller.rb b/app/controllers/gremien_controller.rb index 042bafc..597b83a 100644 --- a/app/controllers/gremien_controller.rb +++ b/app/controllers/gremien_controller.rb @@ -4,7 +4,7 @@ class GremienController < ApplicationController before_filter {@toolbar_elements=[]} def verwalten @gremien = Gremium.all - @gremientabs=Gremium.all + @gremientabs=Gremium.tabs @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 @@ -12,11 +12,18 @@ class GremienController < ApplicationController end end + def index + @gremien = Gremium.order(:typ).order(:name) + @gremientabs=Gremium.tabs + + end + + # GET /gremien/1 # GET /gremien/1.json def show @gremium = Gremium.find(params[:id]) - @gremientabs=Gremium.order(:typ) + @gremientabs=Gremium.tabs 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 342f3b0..643286c 100644 --- a/app/models/gremium.rb +++ b/app/models/gremium.rb @@ -12,13 +12,14 @@ # class Gremium < ActiveRecord::Base - TYPEN={1=>"offiziell", 2=>"offiziell-temporaer", 3 => "inoffiziell",4=>"inoffiziell-tempo"} + TYPEN={1=>"offiziell", 2=>"offiziell-temporär", 3 => "inoffiziell",4=>"inoffiziell-tempo"} + TAPS_TYPEN={1=>true,2=>false,3=>true,4=>false} 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,2]) } + scope :tabs, -> { where(:typ => [1,3]).order(:typ).order(:name) } 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":"") diff --git a/config/routes.rb b/config/routes.rb index cf4b575..89ec740 100755 --- a/config/routes.rb +++ b/config/routes.rb @@ -35,7 +35,7 @@ resources :fotos end - resources :gremien, :except=>[:index] do + resources :gremien do collection do get 'verwalten' end