backlog 0.15.1 → 0.16.0

data/app/views/tasks/edit.rhtml

@@ -1,5 +1,71 @@
+<% @page_title = "#{l :editing} #{l :task}" -%>
+
 <div id="spotlight">
-<% @page_title = "#{l :editing} #{l :task}" %>
+  <div class="btitle" style="float: left; width: 70%">
+    <h4><%=l :task %> #<%=@task.id%></h4>
+  </div>
+
+<% if @task.finished? -%>
+  <div style="float:right">
+    Task is finished.
+  </div>
+<% else -%>
+    <div style="float: left" style="border: 0px">
+    <% if @task.enable_subtasks? && (@task.period.nil? || @task.period.active_or_future?) %>
+      <% form_tag({:controller => 'tasks', :action => :specify, :id => @task}) do %>
+        <%= image_button_to('add.png', l(:specify), :controller => 'tasks', :action => :specify, :id => @task.id)%>
+      <% end %>
+    <% end %>
+    </div>
+    <div style="float: left" style="border: 0px">
+      <%=("&nbsp;" * @task.depth * 4) if @task.depth > 0 %>
+      <%=resolution_image(@task.resolution) if @task.finished_at %>
+      <%="-" if @task.children.size > 0 %>
+    </div>
+
+
+
+    <div style="float: right" style="border: 1px solid black">
+    <div style="float: left" style="border: 1px solid black">
+      <% if @task.loggable? -%>
+          <% if @task.work_started? -%>
+            <% remote_form_for(:work, :url => {:controller => 'works', :action => 'update_time', :id => @task.started_work}) do |f| %>
+              <%=submit_tag('checkmark', :value => l(:save), :style => 'display: none')%>
+              <%=l :started_at%> <%=f.text_field 'started_at_time', :id => "work_#{@task.started_work.id}_started_at_time", :value => @task.started_work.started_at.strftime('%H:%M'),
+                  :class => :task_time, :maxlength => 5 %>
+            <% end %>
+          <% elsif @task.track_times? && (@task.period_id.nil? || @task.period.active?) %>
+            <%=image_link_to_remote 'hammer.png', l(:start_work), {:controller => 'tasks', :action => :start_work, :id => @task.id}, nil, true %>
+          <% end -%>
+      <% end -%>
+    </div>
+    <div style="float: left" style="border: 1px solid black">
+      <% if @task.loggable? && @task.work_started? -%>
+        <% form_tag({:controller => 'works', :action => 'update', :id => @task.started_work}) do %>
+          <%= image_detour_to('ernes_stop.png', l(:end_work), {:controller => 'tasks', :action => :end_work, :id => @task.id}, nil, true) %>
+        <% end -%>
+      <% end -%>
+    </div>
+    <div style="float: left" align="right" style="border: 1px solid black">
+        <% if @task.active? -%>
+          <% if @task.loggable? -%>
+            <% unless @task.work_started? -%>
+      <%# form_tag({:controller => 'tasks', :action => 'update', :id => @task}) do -%>
+              <%=image_link_to_remote('arrow_right.png', l(:move_to_next_period), {:action => :move_task_to_next_period, :id => @task}, nil, true) if @task.backlog.enable_periods? || @task.period_id%>
+              <%=image_link_to_remote('ernes_stop.png', l(:abort), {:action => :abort_task, :id => @task}, nil, true)%>
+      <%# end -%>
+            <% end -%>
+          <% end -%>
+        <% elsif (@task.period.nil? || (not @task.period.passed?)) && @task.leaf? -%>
+      <% form_tag({:controller => 'tasks', :action => 'update', :id => @task}) do -%>
+          <%=image_link_to_remote('eraser.png', l(:reopen), {:action => :reopen_task, :id => @task}, nil, true) %>
+      <% end -%>
+        <% end -%>
+    </div>
+	</div>
+<% end -%>
+
+<br clear="all" />
 
 <% form_tag({:action => 'update', :id => @task}, :multipart => true) do %>
   <%= render :partial => 'form' %>

data/app/views/tasks/notes.rhtml

@@ -1,7 +1,11 @@
-<div id="spotlight">
+<div id="spotlight" style="text-align: left;">
 <% @page_title = "#{l :notes} #{l :task} ##{@task.id}" %>
 
-<pre style="text-align: left;">
+<div class="btitle">
+<h3><%=l :task%> #<%=@task.id%>: <%=@task.description -%></h3>
+</div>
+
+<pre>
 <%=h @task.notes %>
 </pre>
 

data/bin/backlog

@@ -15,6 +15,11 @@ require 'rbconfig'
 
 APPLICATION = 'backlog'
 
+STATUS_STOPPED = 0
+STATUS_RUNNING = 1
+STATUS_STALE = 2
+STATUS_NOT_ROOT = 3
+
 if gem = Gem::searcher.find(APPLICATION)
   INSTALL_DIR = "#{Gem.dir}/gems/#{APPLICATION}-#{gem.version}"
 else
@@ -31,6 +36,23 @@ PID_FILE = '/var/run/backlog.pid'
 def start(config)
   File.makedirs LOG_DIR unless File.exists? LOG_DIR
   File.makedirs File.dirname(PID_FILE) unless File.exists? File.dirname(PID_FILE)
+
+  status = get_status
+  case status
+    when STATUS_RUNNING:
+      puts "Process already running.  Stopping."
+      exit 1
+    when STATUS_STALE:
+      puts "Deleting stale PID file."
+      File.delete(PID_FILE)
+    when STATUS_STOPPED:
+    when STATUS_NOT_ROOT:
+      puts "Permission denied.  Please run as root/administrator."
+      exit 6
+    else
+      puts "Unknown status: #{status}.  Stopping"
+      exit 2
+  end
   `mongrel_rails start -p #{config['port'] || 3000} -e production -c #{INSTALL_DIR} -d -m #{INSTALL_DIR}/config/mime_types.yaml -P #{PID_FILE} 1>#{LOG_DIR}/stdout.log 2>#{LOG_DIR}/stderr.log`
 end
 
@@ -38,6 +60,30 @@ def stop(config)
   `mongrel_rails stop -c #{INSTALL_DIR} -P #{PID_FILE}`
 end
 
+def get_pid
+  if File.exists? PID_FILE
+    return File.readlines(PID_FILE)[0].to_i
+  else
+    return nil
+  end
+end
+
+def get_status
+  pid = get_pid
+  if pid
+    begin
+      Process.kill(0, pid)
+      return STATUS_RUNNING
+    rescue Errno::ESRCH
+      return STATUS_STALE
+    rescue Errno::EPERM
+      return STATUS_NOT_ROOT
+    end
+  else
+    return STATUS_STOPPED
+  end
+end
+
 # See how we were called.
 case ARGV[0]
 when 'start':
@@ -50,7 +96,23 @@ when 'restart':
 when 'reload':
   puts `mongrel_rails restart -c #{INSTALL_DIR} -P #{PID_FILE}`
 when 'status'
-  puts `ps -ef | grep backlog`
+  case get_status
+  when STATUS_RUNNING:
+    puts "#{APPLICATION} is running as pid #{get_pid}."
+    exit 0
+  when STATUS_STOPPED:
+    puts "#{APPLICATION} is stopped."
+    exit 5
+  when STATUS_STALE:
+    puts "#{APPLICATION} is stopped but PID file exists with pid #{get_pid}."
+    exit 4
+  when STATUS_NOT_ROOT:
+    puts "Permission denied.  Please run as root/administrator."
+    exit 6
+  else
+    puts "Unknown status #{get_status}."
+    exit 3
+  end
 when 'setup_unix'
   current_user = `whoami`
   users = `su - postgres -c "echo '\\du' | psql template1"`

data/db/migrate/025_add_simple_auditing_of_tasks.rb

@@ -0,0 +1,11 @@
+class AddSimpleAuditingOfTasks < ActiveRecord::Migration
+  def self.up
+    add_column :tasks, :created_by, :integer, :references => [:users, :party_id]
+    add_column :tasks, :updated_by, :integer, :references => [:users, :party_id]
+  end
+
+  def self.down
+    remove_column :tasks, :updated_by
+    remove_column :tasks, :created_by
+  end
+end

data/db/schema.rb

@@ -2,7 +2,7 @@
 # migrations feature of ActiveRecord to incrementally modify your database, and
 # then regenerate this schema definition.
 
-ActiveRecord::Schema.define(:version => 24) do
+ActiveRecord::Schema.define(:version => 25) do
 
   create_table "backlogs", :force => true do |t|
     t.column "name",            :string,  :limit => 64,                    :null => false
@@ -75,6 +75,8 @@ ActiveRecord::Schema.define(:version => 24) do
     t.column "notes",            :text
     t.column "work_account_id",  :integer
     t.column "customer_id",      :integer
+    t.column "created_by",       :integer
+    t.column "updated_by",       :integer
   end
 
   add_index "tasks", ["parent_id"], :name => "index_tasks_on_parent_id"
@@ -128,6 +130,8 @@ ActiveRecord::Schema.define(:version => 24) do
 
   add_foreign_key "task_files", ["task_id"], "tasks", ["id"], :name => "task_files_task_id_fkey"
 
+  add_foreign_key "tasks", ["updated_by"], "users", ["party_id"], :name => "tasks_updated_by_fkey"
+  add_foreign_key "tasks", ["created_by"], "users", ["party_id"], :name => "tasks_created_by_fkey"
   add_foreign_key "tasks", ["customer_id"], "customers", ["id"], :name => "tasks_customer_id_fkey"
   add_foreign_key "tasks", ["work_account_id"], "work_accounts", ["id"], :name => "tasks_work_account_id_fkey"
   add_foreign_key "tasks", ["backlog_id"], "backlogs", ["id"], :name => "tasks_backlog_id_fkey"

data/lib/url_for_fix.rb

@@ -1,5 +1,5 @@
 module UrlForFix
-  # TODO (uwe): Can be removed when using EdgeRails of Rails >= 1.3
+  # TODO (uwe): Can be removed when using EdgeRails or Rails >= 1.3
   def url_for(org_options = {}, *parameters_for_method_reference)
     return super(org_options, *parameters_for_method_reference) if org_options.nil? || org_options.is_a?(String)
     new_options = {}
@@ -15,12 +15,12 @@ module UrlForFix
   def add_option(options, param, value)
     case value
     when Hash:
-      value.each do |key, value|
-        add_option(options, "#{param}[#{key}]", value)
+      value.each do |key, v|
+        add_option(options, "#{param}[#{key}]", v)
       end
     when Array:
-      hash.each do |value|
-        add_option(options, "#{param}[]", value)
+      value.each do |v|
+        add_option(options, "#{param}[]", v)
       end
     else
       options[param] = value

data/public/javascripts/ruby.js

@@ -0,0 +1,46 @@
+var Ruby = {
+  code: function() {
+    var scripts = document.getElementsByTagName("script");
+    var rubyCode = '';
+  
+    for (var i = 0; i < scripts.length; i++) {
+      var script = scripts[i];
+      if ( (script.getAttribute("type") == "text/ruby") || (script.getAttribute("type") == "text/x-ruby") ) {
+        rubyCode += script.innerHTML;
+      }
+    }
+    return rubyCode;
+  },
+
+  init: function(callback) {
+    Ruby.applet();
+    Ruby.evalScript(callback);
+  },
+
+  evalScript: function(callback) {
+    if (document.RubyApplet.evalRuby && document.RubyApplet.hasStarted()) {
+      callback(Ruby.eval(Ruby.code()));
+    } else {
+      setTimeout(function() {
+        Ruby.evalScript(callback);
+      }, 500);
+    }
+  },
+  
+  eval: function(code) {
+    return document.RubyApplet.evalRuby(code);
+  },
+
+  applet: function() {
+  	var applet = document.createElement('applet');
+  	// applet.setAttribute("archive", "http://ruby-in-browser.googlecode.com/svn/trunk/lib/jruby.jar,http://ruby-in-browser.googlecode.com/svn/trunk/lib/asm.jar,http://ruby-in-browser.googlecode.com/svn/trunk/lib/backport-util-concurrent.jar");
+  	applet.setAttribute("archive", "/java/jruby.jar,/java/bsf.jar");
+  	applet.setAttribute("code", "RubyApplet");
+	applet.setAttribute("codebase", "http://ruby-in-browser.googlecode.com/svn/trunk/classes");
+  	applet.setAttribute("name", "RubyApplet");
+  	applet.setAttribute("width", "1");
+  	applet.setAttribute("height", "1");
+	
+    document.body.appendChild(applet);
+  }
+};

data/test/functional/user_controller_test.rb

@@ -9,7 +9,7 @@ class UserControllerTest < Test::Unit::TestCase
   include UserSystem
   
   self.use_transactional_fixtures = false
-  fixtures :parties, :users, :groups, :groups_users, :backlogs, :periods, :tasks, :task_files, :estimates, :works
+  main_scenario
   
   def setup
     @controller = UserController.new
@@ -40,21 +40,21 @@ class UserControllerTest < Test::Unit::TestCase
     post :login, :user => { :login => "tesla", :password => "wrong password" }
     assert_not_logged_in
     assert_template 'login'
-    assert_contains "Login failed", flash['message']
+    assert_contains "Login failed", flash[:notice]
   end
   
   def test_login__wrong_login
     post :login, :user => { :login => "wrong login", :password => "atest" }
     assert_not_logged_in
     assert_template 'login'
-    assert_contains "Login failed", flash['message']
+    assert_contains "Login failed", flash[:notice]
   end
   
   def test_login__deleted_user_cant_login
     post :login, :user => { :login => "deleted_tesla", :password => "atest" }
     assert_not_logged_in
     assert_template 'login'
-    assert_contains "Login failed", flash['message']
+    assert_contains "Login failed", flash[:notice]
   end
   
   def test_signup
@@ -82,7 +82,7 @@ class UserControllerTest < Test::Unit::TestCase
     :email => "newtesla@example.com"
     assert_not_logged_in
     assert_equal 0, ActionMailer::Base.deliveries.size
-    assert_contains "confirmation email not sent", flash['message']
+    assert_contains "confirmation email not sent", flash[:notice]
   end
   
   def test_signup__mismatched_passwords

data/vendor/plugins/foreign_key_migrations/CHANGELOG

@@ -1,3 +1,39 @@
+[REVISION 20071128]
+
+[FIXED] Workaround to ensure plugin is only ever loaded once.
+
+[REVISION 20070905]
+
+[FIXED] "some_column_name" referenced in foreign key constraint does not exist.
+
+[REVISION 20070904]
+
+[NEW] Support :references keyword when calling primary_key().
+
+[NEW] [#11995] the parameter :references needs the second argument referencing the field name.
+
+[REVISION 20070707]
+
+[NEW] Support acts_as_tree convention: if a column is named parent_id it will be treated as a circular reference to the table in which it is defined.
+
+[REVISION 20070703]
+
+[FIXED] Foreign-keys not created when using add_column.
+
+[REVISION 20070628]
+
+[FIXED] Stack level too deep in 'add_column_without_foreign_key_migrations' (Ronen Barzel).
+
+[REVISION 20070503]
+
+[NEW] Support for SQL92 [NOT] DEFERRABLE on foreign keys.
+
+[REVISION 20061202]
+
+[CHANGED] Use Rails 1.2 alias_method_chain.
+
+[CHANGED] Separate modules into individual files.
+
 [REVISION 20061013]
 
 [NEW] install.rb informs user of missing dependencies.

data/vendor/plugins/foreign_key_migrations/README

@@ -30,6 +30,14 @@ foreign-key to be generated, you can use <code>:references => nil</code>:
     ...
   end
 
+Sometimes you may (for legacy reasons) need to reference a primary key column that is
+named something other than +id+. In this case you can specify the name of the column:
+
+  create_table :orders do |t|
+    t.column :ordered_by_pk, :integer, :null => false, :references => [:customers, :pk]
+    ...
+  end
+
 You also have the option of specifying what to do on delete/update using
 <code>:on_delete</code>/<code>:on_update</code>, respectively to one of:
 <code>:cascade</code>; <code>:restrict</code>; and <code>:set_null</code>:
@@ -39,6 +47,25 @@ You also have the option of specifying what to do on delete/update using
     ...
   end
 
+If your database supports it (for example PostgreSQL) you can also mark the constraint as deferrable:
+
+  create_table :orders do |t|
+    t.column :customer_id, :integer, :deferrable => true
+    ...
+  end
+
+By convention, if a column is named +parent_id+ it will be treated as a circular reference to
+the table in which it is defined.
+
+Sometimes you may (for legacy reasons) need to name your primary key column such that it
+would be misinterpreted as a foreign-key (say for example if you named the primary key
++order_id+). In this case you can manually create the primary key as follows:
+
+  create_table :orders, :id => false do |t|
+    ...
+    t.primary_key :order_id, :references => nil
+  end
+
 The plugin fully supports and understands the following active-record
 configuration properties:
 

data/vendor/plugins/foreign_key_migrations/about.yml

@@ -0,0 +1,5 @@
+author: simon@redhillconsulting.com.au
+summary: Automatically generates foreign-key constraints when creating tables.
+homepage: http://www.redhillonrails.org
+license: MIT
+rails_version: EDGE

data/vendor/plugins/foreign_key_migrations/init.rb

@@ -1,2 +1 @@
-ActiveRecord::ConnectionAdapters::AbstractAdapter.send(:include, RedHillConsulting::ForeignKeyMigrations::AbstractAdapter)
-ActiveRecord::ConnectionAdapters::TableDefinition.send(:include, RedHillConsulting::ForeignKeyMigrations::TableDefinition)
+require 'foreign_key_migrations' unless defined?(RedHillConsulting::ForeignKeyMigrations)

data/vendor/plugins/foreign_key_migrations/lib/foreign_key_migrations.rb

@@ -0,0 +1,3 @@
+ActiveRecord::Base.send(:include, RedHillConsulting::ForeignKeyMigrations::ActiveRecord::Base)
+ActiveRecord::ConnectionAdapters::AbstractAdapter.send(:include, RedHillConsulting::ForeignKeyMigrations::ActiveRecord::ConnectionAdapters::AbstractAdapter)
+ActiveRecord::ConnectionAdapters::TableDefinition.send(:include, RedHillConsulting::ForeignKeyMigrations::ActiveRecord::ConnectionAdapters::TableDefinition)

data/vendor/plugins/foreign_key_migrations/lib/red_hill_consulting/foreign_key_migrations/active_record/base.rb

@@ -0,0 +1,22 @@
+module RedHillConsulting::ForeignKeyMigrations::ActiveRecord
+  module Base
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+
+    module ClassMethods
+      def references(table_name, column_name, options)
+        column_name = column_name.to_s
+        if options.has_key?(:references)
+          references = options[:references]
+          references = [references, :id] unless references.nil? || references.is_a?(Array)
+          references
+        elsif column_name == 'parent_id'
+          [table_name, :id]
+        elsif column_name =~ /^(.*)_id$/
+          [pluralized_table_name($1), :id]
+        end
+      end
+    end
+  end
+end