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

gremien + routes update

Browse Source
This commit is contained in:
Andreas Stephanides
2013-09-01 10:45:31 +02:00
parent 4dbe3f90b4
commit a3ca1f1f10
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/gremien_controller.rb
View File

@@ -1,9 +1,11 @@
class GremienController < ApplicationController class GremienController < ApplicationController
# GET /gremien # GET /gremien
# GET /gremien.json # GET /gremien.json
before_filter {@toolbar_elements=[]}
def verwalten def verwalten
@gremien = Gremium.all @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| respond_to do |format|
format.html # index.html.erb format.html # index.html.erb
format.json { render json: @gremien } format.json { render json: @gremien }

6
app/models/gremium.rb
View File

@@ -1,3 +1,4 @@
# -*- coding: utf-8 -*-
# == Schema Information # == Schema Information
# #
# Table name: gremien # Table name: gremien
@@ -11,12 +12,13 @@
# #
class Gremium < ActiveRecord::Base class Gremium < ActiveRecord::Base
TYPEN={1=>"offiziell"} TYPEN={1=>"offiziell", 2=>"offiziell-temporär", 3 => "inoffiziell","inoffiziell-tempo"}
GESCHLECHT={0=>"s&aumlchlich", 1 => "m&aumlnnlich", 2 => "weiblich"} GESCHLECHT={0=>"saechlich", 1 => "maennlich", 2 => "weiblich"}
ART2FALL={0=>"des", 1=>"des",2=>"der"} ART2FALL={0=>"des", 1=>"des",2=>"der"}
attr_accessible :desc, :name, :typ, :geschlecht,:thema_id attr_accessible :desc, :name, :typ, :geschlecht,:thema_id
has_many :memberships has_many :memberships
belongs_to :thema belongs_to :thema
scope :tabs, { .where(:typ=> 1,:typ=>2)}
def fall2 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":"") Gremium::ART2FALL[self.geschlecht.to_i].to_s+" "+ self.name.to_s+ ((self.geschlecht.to_i==1||self.geschlecht.to_i==0)? "s":"")
end end

1
config/routes.rb
View File

@@ -66,6 +66,7 @@
member do member do
get 'verwalten' get 'verwalten'
put 'addmoderator' put 'addmoderator'
get 'removemoderator'
end end
resources :neuigkeiten, :except => [:index] do resources :neuigkeiten, :except => [:index] do
member do member do