verwaltung, formulare...

app/controllers/neuigkeiten_controller.rb

@@ -32,24 +32,21 @@ class NeuigkeitenController < ApplicationController
     if params[:verwalten] 
       redirect_to verwalten_rubrik_path(@neuigkeit.rubrik)
     end
-    redirect_to @neuigkeit
+    redirect_to rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit)
-
   end 
+
   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
@@ -57,14 +54,11 @@ class NeuigkeitenController < ApplicationController
   
   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" }  
-
       end
     end
   end
@@ -73,10 +67,10 @@ class NeuigkeitenController < ApplicationController
   # 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

app/models/fetprofile.rb

@@ -15,7 +15,7 @@
 #
 
 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

app/models/gremium.rb

@@ -12,13 +12,14 @@
 #
 
 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":"") 
   end

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

app/views/fetprofiles/_form.html.erb

@@ -4,36 +4,47 @@
   <%= f.inputs do %>
     <div class="row-fluid">
       <div class="span4">
-    <%= f.input :vorname %></div>
+	<%= f.input :vorname %>
+      </div>
       <div class="span4"><%= f.input :nachname %></div>
       <div class="span4"><%= f.input :short %>
     </div> </div>
     <div class="row-fluid">
       <div class="span12">   
-    <%= f.input :desc %></div>
+	<%= f.input :desc %>
+      </div>
     </div> 
     <div class="row-fluid">
       <div class="span4"> <%= f.input :active %></div> 
-    <div class="span4"><%= f.input :picture, :as=>:file %></div>
+      <div class="span4">
+	<%= 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>
     
     <%= f.inputs :for => :memberships do |membership,i| %> 
     <div class="row-fluid">
       <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="span2"><%= membership.input :typ ,:as=>:radio, :collection=>Membership::TYPEN.invert %></div>
       
-  </div>  <% end %>
+    </div>  
+    <% end %>
     <% end %>
-
     <div class="row-fluid">
       <div class="span12">
 	<%= f.actions do %>
 	<%= f.action :submit, :as => :input %>
 	<% end %>
+      </div>
+    </div>
  <% end %>
-</div></div></div>
+</div>

app/views/gremien/verwalten.html.erb

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

app/views/neuigkeiten/edit.html.erb

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