db/migrate/20091105233416_inactive_projects.rb @@ -2,7 +2,9 @@ <label for="project_name">Project name:</label> <%= form.text_field :name %> </p> - + <p> + <label for="project_active"><%= form.check_box :active %> Active project</label> + </p> <p> <label for="project_code">Default Code for posting to this project?</label> <span class="at">@</span> app/views/projects/_form.html.erb @@ -50,6 +50,7 @@ </li> <% memberships.each_with_index do |membership, index| -%> <% project = membership.project %> + <% next if ! project.active? %> <% project_hours = project.statuses.filtered_hours(nil, :daily) ; user_hours = project_hours.total(current_user) -%> <li<%= %( class="last") if first_in_collection?(current_user.projects, index) %> id="project-<%= project.id %>"> <a href="<%= url_for project %>"> app/views/projects/_sidebox.html.erb @@ -62,6 +62,5 @@ Rails::Initializer.run do |config| config.after_initialize do %w(ostruct md5).each { |lib| require lib } - Bj.config["production.no_tickle"] = true if RAILS_ENV == 'production' end end config/environment.rb @@ -1,5 +1,5 @@ # This file is auto-generated from the current state of the database. Instead of editing this file, -# please use the migrations feature of ActiveRecord to incrementally modify your database, and +# please use the migrations feature of Active Record to incrementally modify your database, and # then regenerate this schema definition. # # Note that this schema.rb definition is the authoritative source for your database schema. If you need @@ -9,7 +9,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20081003200545) do +ActiveRecord::Schema.define(:version => 20091105233416) do create_table "bj_config", :primary_key => "bj_config_id", :force => true do |t| t.string "hostname" @@ -79,6 +79,20 @@ ActiveRecord::Schema.define(:version => 20081003200545) do add_index "contexts", ["permalink"], :name => "index_contexts_on_permalink" + create_table "delayed_jobs", :force => true do |t| + t.integer "priority", :default => 0 + t.integer "attempts", :default => 0 + t.text "handler" + t.text "last_error" + t.datetime "run_at" + t.datetime "locked_at" + t.datetime "failed_at" + t.string "locked_by" + t.integer "user_id" + t.datetime "created_at" + t.datetime "updated_at" + end + create_table "feeds", :force => true do |t| t.string "name" t.string "url" @@ -112,11 +126,12 @@ ActiveRecord::Schema.define(:version => 20081003200545) do t.integer "context_id" end - create_table "messages", :force => true do |t| - t.integer "user_id" - t.string "message_text" - t.timestamps - end + create_table "messages", :force => true do |t| + t.integer "user_id" + t.string "message_text" + t.datetime "created_at" + t.datetime "updated_at" + end create_table "open_id_authentication_associations", :force => true do |t| t.binary "server_url" @@ -145,6 +160,7 @@ ActiveRecord::Schema.define(:version => 20081003200545) do t.string "code" t.string "permalink" t.string "git_repo" + t.boolean "active", :default => true end add_index "projects", ["code"], :name => "index_projects_on_code" db/schema.rb 2afe45c285fb3e9e64509bbb6a49509405bd0fd4 402259ba629bb1b154127edf6bdbf49162e6985c c3 courtenay@entp.com http://github.com/entp/xtt/commit/cf6469488a9e554e14a1bd3e1867f2cbfa8a4dd4 cf6469488a9e554e14a1bd3e1867f2cbfa8a4dd4 2009-11-05T16:26:57-08:00 2009-11-05T16:26:57-08:00 Merge branch 'production', minor fix on graphs Conflicts: db/schema.rb e93c0221e1e68158dc69eff309b18dd404497ca4 c3 courtenay@entp.com