diff --git a/app/controllers/neuigkeiten_controller.rb b/app/controllers/neuigkeiten_controller.rb index af0f647..484cde9 100755 --- a/app/controllers/neuigkeiten_controller.rb +++ b/app/controllers/neuigkeiten_controller.rb @@ -1,5 +1,5 @@ class NeuigkeitenController < ApplicationController - before_filter {@toolbar_elements=[]} + before_filter {@toolbar_elements=[]} load_and_authorize_resource #def index # @neuigkeiten = Neuigkeit.all @@ -9,75 +9,69 @@ class NeuigkeitenController < ApplicationController def show @neuigkeit = Neuigkeit.find(params[:id]) 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 << {: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 - @toolbar_elements << {:text=>I18n.t('common.verwalten'),:path=>rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit,{:verwalten=>true}),:icon=>:pencil} if can? :verwalten, @neuigkeit - - end + @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 + else + @toolbar_elements << {:text=>I18n.t('common.verwalten'),:path=>rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit,{:verwalten=>true}),:icon=>:pencil} if can? :verwalten, @neuigkeit + + end end - - def new + + def new @neuigkeit = Neuigkeit.new @rubrik=Rubrik.find(params[:rubrik_id]) unless params[:rubrik_id].nil? @neuigkeit.rubrik=@rubrik unless @rubrik.nil? - end - - def publish + end + + def publish @neuigkeit = Neuigkeit.find(params[:id]) @neuigkeit.publish @neuigkeit.save if params[:verwalten] - redirect_to verwalten_rubrik_path(@neuigkeit.rubrik) + redirect_to verwalten_rubrik_path(@neuigkeit.rubrik) end - redirect_to @neuigkeit + redirect_to rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit) + end - end - def edit + def edit @neuigkeit = Neuigkeit.find(params[:id]) + @toolbar_elements << {:text=>I18n.t('common.show'),:path=>rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit)} if can? :show, @neuigkeit end def create @neuigkeit = Neuigkeit.new(params[:neuigkeit]) - - respond_to do |format| if @neuigkeit.save format.html { redirect_to [@neuigkeit.rubrik,@neuigkeit], notice: 'Neuigkeit was successfully created.' } - else format.html { render action: "new" } - end end end - - + + 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.html { redirect_to [@neuigkeit.rubrik,@neuigkeit], notice: 'Neuigkeit was successfully updated.' } else - format.html { render action: "edit" } - + format.html { render action: "edit" } end end end - + # DELETE /neuigkeiten/1 # DELETE /neuigkeiten/1.json def destroy @neuigkeit = Neuigkeit.find(params[:id]) + rubrik=@neuigkeit.rubrik @neuigkeit.destroy - respond_to do |format| - format.html { redirect_to neuigkeiten_url } - + format.html { redirect_to rubrik } + end end end diff --git a/app/models/fetprofile.rb b/app/models/fetprofile.rb index f646d39..360e19a 100644 --- a/app/models/fetprofile.rb +++ b/app/models/fetprofile.rb @@ -15,16 +15,16 @@ # 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 :gremien, :through=> :membership mount_uploader :picture, PictureUploader def name - [vorname, nachname, "(",short,")"].join(" ") + [vorname, nachname, "(",short,")"].join(" ") end accepts_nested_attributes_for :memberships scope :active, -> { where(:active=>true).order(:vorname) } def fetmail - fetmailalias.empty? ? short + "@fet.at" : fetmailalias + "@fet.at" + fetmailalias.empty? ? short + "@fet.at" : fetmailalias + "@fet.at" end end diff --git a/app/models/gremium.rb b/app/models/gremium.rb index 9db41df..342f3b0 100644 --- a/app/models/gremium.rb +++ b/app/models/gremium.rb @@ -12,15 +12,16 @@ # 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"} 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)} + scope :tabs, -> { where(:typ => [1,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":"") + 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 diff --git a/app/models/neuigkeit.rb b/app/models/neuigkeit.rb index 52342fa..1c11d01 100755 --- a/app/models/neuigkeit.rb +++ b/app/models/neuigkeit.rb @@ -33,7 +33,7 @@ class Neuigkeit < ActiveRecord::Base self.rubrik.public && self.datum >=Time.now.to_date end def publish - self.datum = Time.now + self.datum = Date.today end def reverse_publish self.datum = nil diff --git a/app/views/fetprofiles/_form.html.erb b/app/views/fetprofiles/_form.html.erb index 3df54ea..5a056df 100644 --- a/app/views/fetprofiles/_form.html.erb +++ b/app/views/fetprofiles/_form.html.erb @@ -1,39 +1,50 @@
-<%= semantic_form_for @fetprofile do |f| %> + <%= semantic_form_for @fetprofile do |f| %> <%= f.inputs do %>
-
- <%= f.input :vorname %>
-
<%= f.input :nachname %>
-
<%= f.input :short %> -
-
-
- <%= f.input :desc %>
+
+ <%= f.input :vorname %> +
+
<%= f.input :nachname %>
+
<%= f.input :short %> +
+
+
+ <%= f.input :desc %> +
-
<%= f.input :active %>
-
<%= f.input :picture, :as=>:file %>
-
<%= f.input :fetmailalias %>
+
<%= f.input :active %>
+
+ <%= image_tag(@fetprofile.picture.thumb.url) unless @fetprofile.picture.nil? %> + <%= f.file_field :picture %> + <%= f.hidden_field :picture_cache %> + +
+
<%= f.input :fetmailalias %>
- - <%= f.inputs :for => :memberships do |membership,i| %> -
-
- -
<%= membership.input :start, :as=>:date %>
-
<%= membership.input :stop %>
-
<%= membership. input :gremium %>
-
<%= membership.input :typ ,:as=>:radio, :collection=>Membership::TYPEN.invert %>
- -
<% end %> - <% end %> - -
-
- <%= f.actions do %> - <%= f.action :submit, :as => :input %> - <% end %> -<% end %> -
+ + <%= f.inputs :for => :memberships do |membership,i| %> +
+
+
<%= membership.input :start, :as=>:datepicker %>
+
<%= membership.input :stop, :as=>:datepicker,:label=>false %>
+
<%= membership. input :gremium %>
+
<%= membership.input :typ ,:as=>:radio, :collection=>Membership::TYPEN.invert %>
+ +
+ <% end %> + <% end %> +
+
+ <%= f.actions do %> + <%= f.action :submit, :as => :input %> + <% end %> +
+
+ <% end %> + diff --git a/app/views/gremien/verwalten.html.erb b/app/views/gremien/verwalten.html.erb index 0205204..ec214f0 100644 --- a/app/views/gremien/verwalten.html.erb +++ b/app/views/gremien/verwalten.html.erb @@ -30,3 +30,6 @@
<%= render 'layouts/pretty_toolbar' %> <%= link_to 'New Gremium', new_gremium_path %> + + + diff --git a/app/views/neuigkeiten/edit.html.erb b/app/views/neuigkeiten/edit.html.erb index 1e36ba0..d9bec4c 100755 --- a/app/views/neuigkeiten/edit.html.erb +++ b/app/views/neuigkeiten/edit.html.erb @@ -1,6 +1,4 @@

Editing neuigkeit

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