Sorting by state order, unelegantly.

zeliboba · Oct 16, 2011 · 78a577e · 78a577e
1 parent 05acd90
commit 78a577e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/app/controllers/flats_controller.rb b/app/controllers/flats_controller.rb
@@ -40,7 +40,7 @@ def create
 
     if @flat.save
       flash[:created_flat_id] = @flat.id
-      redirect_to flats_path, :notice => 'Flat was successfully created.'
+      redirect_to flats_path, :notice => 'Flat created.'
     else
       flash[:error] = @flat.errors
       render :action => "new"
@@ -52,7 +52,7 @@ def update
 
     respond_to do |format|
       if @flat.update_attributes(params[:flat])
-        flash[:notice] = 'flat was successfully updated.'
+        flash[:notice] = 'Flat updated.'
         format.html { redirect_to(flats_path) }
         format.xml  { head :ok }
       else

diff --git a/app/views/flats/_flats_list.html.haml b/app/views/flats/_flats_list.html.haml
@@ -1,4 +1,6 @@
 #flats-list
-  - @flats.group_by(&:state).each do |state, flats|
-    = render :partial => "flats_table", :locals => { :flats => flats, :state => state, :show_phone => false }
+  - Flat::STATES.each do |state|
+    - flats = @flats.select { |flat| flat.state == state }
+    - unless flats.empty?
+      = render :partial => "flats_table", :locals => { :flats => flats, :show_phone => false }
 
diff --git a/app/views/flats/_flats_table.html.haml b/app/views/flats/_flats_table.html.haml
@@ -1,7 +1,7 @@
 %table.flats
   %tr
     %th.state
-      %h2= state.humanize
+      %h2= flats.first.state.humanize
     %th €
     %th m²
     %th.rooms rooms