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

verwaltung, formulare...

Browse Source
This commit is contained in:
Andreas Stephanides
2013-09-01 11:40:45 +02:00
parent f37d8d442d
commit 9b16843d83
7 changed files with 81 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
app/controllers/neuigkeiten_controller.rb
View File

@@ -1,5 +1,5 @@
class NeuigkeitenController < ApplicationController class NeuigkeitenController < ApplicationController
before_filter {@toolbar_elements=[]} before_filter {@toolbar_elements=[]}
load_and_authorize_resource load_and_authorize_resource
#def index #def index
# @neuigkeiten = Neuigkeit.all # @neuigkeiten = Neuigkeit.all
@@ -9,75 +9,69 @@ class NeuigkeitenController < ApplicationController
def show def show
@neuigkeit = Neuigkeit.find(params[:id]) @neuigkeit = Neuigkeit.find(params[:id])
if params[:verwalten] if params[:verwalten]
@toolbar_elements << {:hicon=>'icon-plus', :text=> I18n.t('neuigkeit.publish'),:path => publish_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit),:confirm=>"Sure?" } if can? :publish, @neuigkeit @toolbar_elements << {:hicon=>'icon-plus', :text=> I18n.t('neuigkeit.publish'),:path => publish_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit),:confirm=>"Sure?" } if can? :publish, @neuigkeit
@toolbar_elements << {:text=>I18n.t('common.edit'),:path=>edit_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit),:icon=>:pencil} if can? :edit, @neuigkeit @toolbar_elements << {:text=>I18n.t('common.edit'),:path=>edit_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit),:icon=>:pencil} if can? :edit, @neuigkeit
@toolbar_elements << {:hicon=>'icon-remove-circle', :text=> I18n.t('common.delete'),:path => rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit), :method=> :delete,:confirm=>"Sure?" } if can? :delete, @neuigkeit @toolbar_elements << {:hicon=>'icon-remove-circle', :text=> I18n.t('common.delete'),:path => rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit), :method=> :delete,:confirm=>"Sure?" } if can? :delete, @neuigkeit
else else
@toolbar_elements << {:text=>I18n.t('common.verwalten'),:path=>rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit,{:verwalten=>true}),:icon=>:pencil} if can? :verwalten, @neuigkeit @toolbar_elements << {:text=>I18n.t('common.verwalten'),:path=>rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit,{:verwalten=>true}),:icon=>:pencil} if can? :verwalten, @neuigkeit
end end
end end
def new def new
@neuigkeit = Neuigkeit.new @neuigkeit = Neuigkeit.new
@rubrik=Rubrik.find(params[:rubrik_id]) unless params[:rubrik_id].nil? @rubrik=Rubrik.find(params[:rubrik_id]) unless params[:rubrik_id].nil?
@neuigkeit.rubrik=@rubrik unless @rubrik.nil? @neuigkeit.rubrik=@rubrik unless @rubrik.nil?
end end
def publish def publish
@neuigkeit = Neuigkeit.find(params[:id]) @neuigkeit = Neuigkeit.find(params[:id])
@neuigkeit.publish @neuigkeit.publish
@neuigkeit.save @neuigkeit.save
if params[:verwalten] if params[:verwalten]
redirect_to verwalten_rubrik_path(@neuigkeit.rubrik) redirect_to verwalten_rubrik_path(@neuigkeit.rubrik)
end end
redirect_to @neuigkeit redirect_to rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit)
end
end def edit
def edit
@neuigkeit = Neuigkeit.find(params[:id]) @neuigkeit = Neuigkeit.find(params[:id])
@toolbar_elements << {:text=>I18n.t('common.show'),:path=>rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit)} if can? :show, @neuigkeit
end end
def create def create
@neuigkeit = Neuigkeit.new(params[:neuigkeit]) @neuigkeit = Neuigkeit.new(params[:neuigkeit])
respond_to do |format| respond_to do |format|
if @neuigkeit.save if @neuigkeit.save
format.html { redirect_to [@neuigkeit.rubrik,@neuigkeit], notice: 'Neuigkeit was successfully created.' } format.html { redirect_to [@neuigkeit.rubrik,@neuigkeit], notice: 'Neuigkeit was successfully created.' }
else else
format.html { render action: "new" } format.html { render action: "new" }
end end
end end
end end
def update def update
@neuigkeit = Neuigkeit.find(params[:id]) @neuigkeit = Neuigkeit.find(params[:id])
respond_to do |format| respond_to do |format|
if @neuigkeit.update_attributes(params[:neuigkeit]) if @neuigkeit.update_attributes(params[:neuigkeit])
format.html { redirect_to @neuigkeit, notice: 'Neuigkeit was successfully updated.' } format.html { redirect_to [@neuigkeit.rubrik,@neuigkeit], notice: 'Neuigkeit was successfully updated.' }
else else
format.html { render action: "edit" } format.html { render action: "edit" }
end end
end end
end end
# DELETE /neuigkeiten/1 # DELETE /neuigkeiten/1
# DELETE /neuigkeiten/1.json # DELETE /neuigkeiten/1.json
def destroy def destroy
@neuigkeit = Neuigkeit.find(params[:id]) @neuigkeit = Neuigkeit.find(params[:id])
rubrik=@neuigkeit.rubrik
@neuigkeit.destroy @neuigkeit.destroy
respond_to do |format| respond_to do |format|
format.html { redirect_to neuigkeiten_url } format.html { redirect_to rubrik }
end end
end end
end end

6
app/models/fetprofile.rb
View File

@@ -15,16 +15,16 @@
# #
class Fetprofile < ActiveRecord::Base class Fetprofile < ActiveRecord::Base
attr_accessible :active, :desc, :fetmailalias, :nachname, :picture, :short, :vorname,:memberships_attributes attr_accessible :active, :desc, :fetmailalias, :nachname, :picture, :short, :vorname,:memberships_attributes,:remove_picture,:picture_cache
has_many :memberships has_many :memberships
has_many :gremien, :through=> :membership has_many :gremien, :through=> :membership
mount_uploader :picture, PictureUploader mount_uploader :picture, PictureUploader
def name def name
[vorname, nachname, "(",short,")"].join(" ") [vorname, nachname, "(",short,")"].join(" ")
end end
accepts_nested_attributes_for :memberships accepts_nested_attributes_for :memberships
scope :active, -> { where(:active=>true).order(:vorname) } scope :active, -> { where(:active=>true).order(:vorname) }
def fetmail def fetmail
fetmailalias.empty? ? short + "@fet.at" : fetmailalias + "@fet.at" fetmailalias.empty? ? short + "@fet.at" : fetmailalias + "@fet.at"
end end
end end

7
app/models/gremium.rb
View File

@@ -12,15 +12,16 @@
# #
class Gremium < ActiveRecord::Base class Gremium < ActiveRecord::Base
TYPEN={1=>"offiziell", 2=>"offiziell-temporär", 3 => "inoffiziell","inoffiziell-tempo"} TYPEN={1=>"offiziell", 2=>"offiziell-temporaer", 3 => "inoffiziell",4=>"inoffiziell-tempo"}
GESCHLECHT={0=>"saechlich", 1 => "maennlich", 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)} scope :tabs, -> { where(:typ => [1,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
end end

2
app/models/neuigkeit.rb
View File

@@ -33,7 +33,7 @@ class Neuigkeit < ActiveRecord::Base
self.rubrik.public && self.datum >=Time.now.to_date self.rubrik.public && self.datum >=Time.now.to_date
end end
def publish def publish
self.datum = Time.now self.datum = Date.today
end end
def reverse_publish def reverse_publish
self.datum = nil self.datum = nil

75
app/views/fetprofiles/_form.html.erb
View File

@@ -1,39 +1,50 @@
<div class="container-fluid"> <div class="container-fluid">
<%= semantic_form_for @fetprofile do |f| %> <%= semantic_form_for @fetprofile do |f| %>
<%= f.inputs do %> <%= f.inputs do %>
<div class="row-fluid"> <div class="row-fluid">
<div class="span4"> <div class="span4">
<%= f.input :vorname %></div> <%= f.input :vorname %>
<div class="span4"><%= f.input :nachname %></div> </div>
<div class="span4"><%= f.input :short %> <div class="span4"><%= f.input :nachname %></div>
</div> </div> <div class="span4"><%= f.input :short %>
<div class="row-fluid"> </div> </div>
<div class="span12"> <div class="row-fluid">
<%= f.input :desc %></div> <div class="span12">
<%= f.input :desc %>
</div>
</div> </div>
<div class="row-fluid"> <div class="row-fluid">
<div class="span4"> <%= f.input :active %></div> <div class="span4"> <%= f.input :active %></div>
<div class="span4"><%= f.input :picture, :as=>:file %></div> <div class="span4">
<div class="span4"> <%= f.input :fetmailalias %></div> <%= image_tag(@fetprofile.picture.thumb.url) unless @fetprofile.picture.nil? %>
<%= f.file_field :picture %>
<%= f.hidden_field :picture_cache %>
<label>
<%= f.check_box :remove_picture %>
Bild Entfernen
</label>
</div>
<div class="span4"> <%= f.input :fetmailalias %></div>
</div> </div>
<%= f.inputs :for => :memberships do |membership,i| %> <%= f.inputs :for => :memberships do |membership,i| %>
<div class="row-fluid"> <div class="row-fluid">
<div class="span1"></div> <div class="span1"></div>
<div class="span3"><%= membership.input :start, :as=>:datepicker %></div>
<div class="span3"><%= membership.input :start, :as=>:date %></div> <div class="span3"><%= membership.input :stop, :as=>:datepicker,:label=>false %></div>
<div class="span3"><%= membership.input :stop %></div> <div class="span3"><%= membership. input :gremium %></div>
<div class="span3"><%= membership. input :gremium %></div> <div class="span2"><%= membership.input :typ ,:as=>:radio, :collection=>Membership::TYPEN.invert %></div>
<div class="span2"><%= membership.input :typ ,:as=>:radio, :collection=>Membership::TYPEN.invert %></div>
</div>
</div> <% end %> <% end %>
<% end %> <% end %>
<div class="row-fluid">
<div class="row-fluid"> <div class="span12">
<div class="span12"> <%= f.actions do %>
<%= f.actions do %> <%= f.action :submit, :as => :input %>
<%= f.action :submit, :as => :input %> <% end %>
<% end %> </div>
<% end %> </div>
</div></div></div> <% end %>
</div>

3
app/views/gremien/verwalten.html.erb
View File

@@ -30,3 +30,6 @@
<br /> <br />
<%= render 'layouts/pretty_toolbar' %> <%= render 'layouts/pretty_toolbar' %>
<%= link_to 'New Gremium', new_gremium_path %> <%= link_to 'New Gremium', new_gremium_path %>

4
app/views/neuigkeiten/edit.html.erb
View File

@@ -1,6 +1,4 @@
<h1>Editing neuigkeit</h1> <h1>Editing neuigkeit</h1>
<%= %> <%= %>
<%= render 'form' %> <%= render 'form' %>
<%= render 'layouts/pretty_toolbar' %>
<%= link_to 'Show', @neuigkeit %> |
<%= link_to 'Back', neuigkeiten_path %>