Skip to content

Commit

Permalink
Stylesheet updating, standard.css is now deprecated for base.scss. Fixes
Browse files Browse the repository at this point in the history
 #80.
  • Loading branch information
mjy committed Jun 4, 2012
1 parent 5a66eac commit 23175a1
Show file tree
Hide file tree
Showing 7 changed files with 497 additions and 474 deletions.
4 changes: 2 additions & 2 deletions app/controllers/otu_groups_controller.rb
Expand Up @@ -12,7 +12,7 @@ def list
def show
id = params[:otu_group][:id] if params[:otu_group]
id ||= params[:id]
@otu_group = OtuGroup.find(id, :include => [:otus])
@otu_group = OtuGroup.find(id, :include => [{:otus])
@otus_in = @otu_group.otu_groups_otus(:include => :otus)
@show = ['default']
end
Expand Down Expand Up @@ -173,7 +173,7 @@ def sort_by_select
OtuGroupsOtu.find(:all, :conditions => {:otu_group_id => params[:id]}, :order => "otus.#{params[:sort_by].gsub(/\s/,"_")}", :include => :otu).each_with_index do |o, i|
o.update_attribute(:position, i)
end
flash[:notice] = "Sorted by #{params[:sort_by]}."
notice "Sorted by #{params[:sort_by]}."
redirect_to :action => :show, :id => params[:id]
end

Expand Down

0 comments on commit 23175a1

Please sign in to comment.