@@ -401,7 +401,15 @@ class ApplicationController < ActionController::Base :user => current_user) title = highlight_all(title, highlight_keys) - html = { :class => "tooltip#{task.css_classes}", :title => title } + html = { + :class => "tooltip tasklink #{task.css_classes}", + :title => title + } + + if @ajax_task_links + html[:onclick] = "showTaskInPage(#{ task.task_num }); return false;" + end + text = truncate ? task.name : self.class.helpers.truncate(task.name, :length => 80) text = highlight_all(text, highlight_keys) app/controllers/application_controller.rb @@ -209,6 +209,9 @@ class TasksController < ApplicationController def edit @task = current_user.company.tasks.find_by_task_num(params[:id]) + @ajax_task_links = request.xhr? # want to use ajax task loads if this page was loaded by ajax + + if @task.nil? or !current_user.can_view_task?(@task) flash['notice'] = _("You don't have access to that task, or it doesn't exist.") redirect_from_last @@ -1115,9 +1118,6 @@ class TasksController < ApplicationController task.due_at = tz.utc_to_local(@task.due_at) unless task.due_at.nil? @tags = {} - @logs = WorkLog.find(:all, :order => "work_logs.started_at desc,work_logs.id desc", :conditions => ["work_logs.task_id = ? #{"AND (work_logs.comment = 1 OR work_logs.log_type=6)" if session[:only_comments].to_i == 1}", task.id], :include => [:user, :task, :project]) - @logs ||= [] - @projects = User.find(current_user.id).projects.find(:all, :order => 'name', :conditions => ["completed_at IS NULL"]).collect {|c| [ "#{c.name} / #{c.customer.name}", c.id ] if current_user.can?(c, 'create') }.compact unless current_user.projects.nil? @notify_targets = current_projects.collect{ |p| p.users.collect(&:name) }.flatten.uniq @@ -1167,6 +1167,7 @@ class TasksController < ApplicationController # Subscribe to the juggernaut channel for Task updates session[:channels] += ["tasks_#{current_user.company_id}"] @tasks = current_task_filter.tasks + @ajax_task_links = true end end app/controllers/tasks_controller.rb @@ -213,10 +213,6 @@ module ApplicationHelper text end -# def link_to_task(task) -# "<strong>#{task.issue_num}</strong> <a href=\"/tasks/edit/#{task.task_num}\" class=\"tooltip#{task.css_classes}\" title=\"#{task.to_tip({ :duration_format => current_user.duration_format, :workday_duration => current_user.workday_duration, :days_per_week => current_user.days_per_week, :user => current_user })}\">#{h(truncate(task.name, :length => 80))}</a>" -# end - def milestone_classes(m) return " complete_milestone" unless m.completed_at.nil? app/helpers/application_helper.rb @@ -19,7 +19,7 @@ class WorkLog < ActiveRecord::Base has_many :work_log_notifications, :dependent => :destroy has_many :users, :through => :work_log_notifications - named_scope :comments, :conditions => [ "work_logs.comment = 1 or work_logs.log_type = 6" ] + named_scope :comments, :conditions => [ "work_logs.comment = ? or work_logs.log_type = ?", true, 6 ] validates_presence_of :started_at app/models/work_log.rb @@ -4,7 +4,9 @@ <% end %> <% if dependency.done? %> - <img src="/images/tick.png" border=0><% else %> <% end %><%= link_to_task(dependency) %> - <input name="dependencies[]" type="hidden" value="<%=dependency.task_num%>"> - <span class="divider"></span> + <img src="/images/tick.png" border=0> + <% end %> + <%= link_to_task(dependency) %> + <%= hidden_field_tag :dependencies, dependency.task_num, :index => nil %> + <span class="divider"></span> </div> app/views/tasks/_dependency.html.erb @@ -202,12 +202,12 @@ it in the current page. */ function showTaskInPage(taskNum) { jQuery("#task_list tr.selected").removeClass("selected"); - jQuery("#task_list #task_row_" + taskNum).addClass("selected"); + jQuery("#task_list #task_row_" + taskNum).addClass("selected"); - jQuery("#task").fadeOut(); + jQuery("#task").fadeOut(); jQuery.get("/tasks/edit/" + taskNum, {}, function(data) { - jQuery("#task").html(data); - jQuery("#task").fadeIn('slow'); + jQuery("#task").html(data); + jQuery("#task").fadeIn('slow'); }); } public/javascripts/application.js 4f05115019297cfd5f4c9ea9114ed88c1ede347e Brad Wilson brad@lucky-dip.net http://github.com/ari/clockingit/commit/b3b365465581273688dfcf33e7c4ca9c57a78a95 b3b365465581273688dfcf33e7c4ca9c57a78a95 2009-11-01T23:29:52-08:00 2009-11-01T23:29:52-08:00 ajax load tasks when in the task list view dd63eaca6db1150bee28e8e82de7016ca619d305 Brad Wilson brad@lucky-dip.net