app/controllers/administration/scheduled_tasks_controller.rb app/views/administration/scheduled_tasks/_form.erb app/views/administration/scheduled_tasks/edit.html.erb app/views/administration/scheduled_tasks/index.html.erb app/views/administration/scheduled_tasks/new.html.erb lib/recipes/templates/maintenance.html lib/recipes/web.rb @@ -139,7 +139,7 @@ class GroupsController < ApplicationController private def feature_enabled? - unless Setting.get(:features, :groups) and Site.current.max_groups > 0 + unless Setting.get(:features, :groups) and (Site.current.max_groups.nil? or Site.current.max_groups > 0) redirect_to people_path false end app/controllers/groups_controller.rb @@ -3,7 +3,7 @@ class SharesController < ApplicationController def index @pictures = Picture.all(:limit => 10, :order => 'created_at desc') @verses = Verse.all(:limit => 5, :order => 'created_at desc') - @recipes = Recipe.all(:limit => 5, :order => 'created_at desc') + @recipes = Recipe.paginate(:per_page => 5, :order => 'created_at desc', :page => 1) @publications = Publication.all(:limit => 2, :order => 'created_at desc') end app/controllers/shares_controller.rb @@ -34,7 +34,7 @@ in the <%= link_to h(object.group.name_group), url_for(object.group) %>. <% elsif object.is_a? Message and object.wall %> posted a message on - <%= link_to "#{object.wall.name_possessive} wall", url_for(object.wall, :anchor => 'wall') %>. + <%= link_to "#{object.wall.name_possessive} wall", person_path(object.wall, :anchor => 'wall') %>. <% elsif object.is_a? Person %> updated <%= item.person == @logged_in ? 'your' : 'their' %> <%= item.showable_change_keys.to_sentence %>. app/views/feeds/_log_item.erb @@ -11,5 +11,5 @@ <% if @tag.recipes.any? %> <h2>Recipes</h2> - <%= render :partial => 'recipes/list', :locals => {:recipes => @tag.recipes} %> + <%= render :partial => 'recipes/list', :locals => {:recipes => @tag.recipes.paginate(:page => 1, :per_page => 100)} %> <% end %> app/views/tags/show.html.erb @@ -29,4 +29,3 @@ set :repository_cache, 'git_cache' set :deploy_via, :remote_cache set :deploy_to, "/var/www/apps/#{application}" set :use_sudo, false -set :maintenance_file_path, "#{shared_path}/public/maintenance.html" config/deploy.rb.example @@ -13,7 +13,7 @@ class CreateAlbums < ActiveRecord::Migration Site.each do |site| Picture.all.each do |picture| name, description, person_id = \ - picture.connection.select_one(['select name, description, person_id from events where id = ?', picture.event_id]) + picture.connection.select_one("select name, description, person_id from events where id = #{picture.event_id}") album = Album.find_or_initialize_by_name(name) album.update_attributes! :description => description, :person_id => person_id picture.album = album db/migrate/20080709134559_create_albums.rb @@ -1,7 +1,7 @@ class CleanUp < ActiveRecord::Migration def self.up change_table :families do |t| - t.remove :security_token + t.remove :security_token rescue nil t.remove :mail_group end end db/migrate/20080720215226_clean_up.rb app/controllers/scheduled_tasks_controller.rb app/views/scheduled_tasks/_form.erb app/views/scheduled_tasks/edit.html.erb app/views/scheduled_tasks/index.html.erb app/views/scheduled_tasks/new.html.erb a4008e480741d86bf97da757f627e20856c6db33 Tim Morgan tim@timmorgan.org http://github.com/seven1m/onebody/commit/471a6fe575ace050df45cd6ab01c552a5d3e910e 471a6fe575ace050df45cd6ab01c552a5d3e910e 2008-08-19T17:37:46-07:00 2008-08-19T17:37:46-07:00 Move scheduled tasks controller into administration namespace. Fix recipe listing in various places. Fix log item wall link. Add web cap tasks. 953b41de052f6043c48a0d1f7c38cb7646950eef Tim Morgan tim@timmorgan.org