List bugs submited or commented on by user

diff --git a/app/controllers/map_bugs_controller.rb b/app/controllers/map_bugs_controller.rb
index 76f99123eab43485e65536456eda1a1e805a1526..596ec4d5c58cafec2f4c019304196884de5bc352 100644 (file)
--- a/app/controllers/map_bugs_controller.rb
+++ b/app/controllers/map_bugs_controller.rb
@@ -1,9 +1,12 @@
 class MapBugsController < ApplicationController
 
+  layout 'site', :only => [:my_bugs]
+
   before_filter :check_api_readable
-  before_filter :authorize_web, :only => [:add_bug, :close_bug, :edit_bug, :delete]
+  before_filter :authorize_web, :only => [:add_bug, :close_bug, :edit_bug, :delete, :my_bugs]
   before_filter :check_api_writable, :only => [:add_bug, :close_bug, :edit_bug, :delete]
   before_filter :require_moderator, :only => [:delete]
+  before_filter :set_locale, :only => [:my_bugs]
   after_filter :compress_output
   around_filter :api_call_handle_error, :api_call_timeout
 
@@ -146,11 +149,12 @@ class MapBugsController < ApplicationController
        raise OSM::APIBadUserInput.new("No query string was given") unless params['q']
        limit = getLimit
        conditions = closedCondition
+       conditions = cond_merge conditions, ['map_bug_comment.comment ~ ?', params['q']]
        
        #TODO: There should be a better way to do this.   CloseConditions are ignored at the moment
 
        bugs2 = MapBug.find(:all, :limit => limit, :order => "last_changed DESC", :joins => :map_bug_comment,
-                                               :conditions => ['map_bug_comment.comment ~ ?', params['q']])
+                                               :conditions => conditions)
        @bugs = bugs2.uniq
        respond_to do |format|
          format.html {render :template => 'map_bugs/get_bugs.js', :content_type => "text/javascript"}
@@ -162,6 +166,66 @@ class MapBugsController < ApplicationController
        end
   end
 
+  def my_bugs
+ 
+    if params[:display_name] 
+      @user2 = User.find_by_display_name(params[:display_name], :conditions => { :visible => true }) 
+ 
+      if @user2  
+        if @user2.data_public? or @user2 == @user 
+          conditions = ['map_bug_comment.commenter_id = ?', @user2.id] 
+        else 
+          conditions = ['false'] 
+        end 
+      elsif request.format == :html 
+        @title = t 'user.no_such_user.title' 
+        @not_found_user = params[:display_name] 
+        render :template => 'user/no_such_user', :status => :not_found 
+      end 
+    end
+
+       if @user2 
+      user_link = render_to_string :partial => "user", :object => @user2 
+    end 
+
+       @title =  t 'bugs.user.title_user', :user => @user2.display_name 
+    @heading =  t 'bugs.user.heading_user', :user => @user2.display_name 
+    @description = t 'bugs.user.description_user', :user => user_link
+
+       @page = (params[:page] || 1).to_i 
+    @page_size = 10
+
+       @bugs = MapBug.find(:all, 
+                                               :include => [:map_bug_comment, {:map_bug_comment => :user}],
+                                               :joins => :map_bug_comment,
+                                               :order => "last_changed DESC",
+                                               :conditions => conditions,
+                                               :offset => (@page - 1) * @page_size, 
+                                               :limit => @page_size).uniq
+       
+  end
+
+private 
+  #------------------------------------------------------------ 
+  # utility functions below. 
+  #------------------------------------------------------------   
+ 
+  ## 
+  # merge two conditions 
+  # TODO: this is a copy from changeset_controler.rb and should be factored out to share
+  def cond_merge(a, b) 
+    if a and b 
+      a_str = a.shift 
+      b_str = b.shift 
+      return [ a_str + " AND " + b_str ] + a + b 
+    elsif a  
+      return a 
+    else b 
+      return b 
+    end 
+  end 
+
+
 
   def render_ok
        output_js = :false
@@ -186,11 +250,11 @@ class MapBugsController < ApplicationController
        closed_since = params['closed'].to_i if params['closed']
        
        if closed_since < 0
-         conditions = "status != 'hidden'"
+         conditions = ["status != 'hidden'"]
        elsif closed_since > 0
-         conditions = "((status = 'open') OR ((status = 'closed' ) AND (date_closed > '" + (Time.now - 7.days).to_s + "')))"
+         conditions = ["((status = 'open') OR ((status = 'closed' ) AND (date_closed > '" + (Time.now - closed_since.days).to_s + "')))"]
        else
-         conditions = "status = 'open'"
+         conditions = ["status = 'open'"]
        end
 
        return conditions

diff --git a/app/views/map_bugs/_bugs_paging_nav.html.erb b/app/views/map_bugs/_bugs_paging_nav.html.erb
new file mode 100644 (file)
index 0000000..3de1790
--- /dev/null
+++ b/app/views/map_bugs/_bugs_paging_nav.html.erb
@@ -0,0 +1,17 @@
+<p>
+
+<% if @page > 1 %>
+<%= link_to t('changeset.changeset_paging_nav.previous'), params.merge({ :page => @page - 1 }) %>
+<% else %>
+<%= t('changeset.changeset_paging_nav.previous') %>
+<% end %>
+
+| <%= t('changeset.changeset_paging_nav.showing_page', :page => @page) %> |
+
+<% if @bugs.size < @page_size %>
+<%= t('changeset.changeset_paging_nav.next') %>
+<% else %>
+<%= link_to t('changeset.changeset_paging_nav.next'), params.merge({ :page => @page + 1 }) %>
+<% end %>
+
+</p>

diff --git a/app/views/map_bugs/_user.html.erb b/app/views/map_bugs/_user.html.erb
new file mode 100644 (file)
index 0000000..0e95076
--- /dev/null
+++ b/app/views/map_bugs/_user.html.erb
@@ -0,0 +1 @@
+<%= link_to user.display_name, :controller => "user", :action => "view", :display_name => user.display_name %>

diff --git a/app/views/map_bugs/my_bugs.html.erb b/app/views/map_bugs/my_bugs.html.erb
new file mode 100644 (file)
index 0000000..97e5700
--- /dev/null
+++ b/app/views/map_bugs/my_bugs.html.erb
@@ -0,0 +1,45 @@
+<h1><%= @heading %></h1>
+<p><%= @description %></p>
+
+<%= render :partial => 'bugs_paging_nav' %>
+
+<table id="bug_list" cellpadding="3">
+       <tr>
+       <th></th>
+               <th><%= t'bugs.user.id' %></th>
+               <th><%= t'changeset.changesets.user' %></th>
+               <th><%= t'changeset.changesets.comment' %></th>
+       <th><%= t'changeset.changesets.saved_at' %></th>
+               <th><%= t'bugs.user.last_changed' %></th>
+       
+       
+       </tr>
+<% @bugs.each do |bug| %>
+<% if bug.map_bug_comment[0].user == @user2 %>
+       <tr>
+<% else %>     
+       <tr bgcolor=#EEEEEE>
+<% end %>      
+               <td>
+                       <% if bug.status == "closed" %>
+                               <%= image_tag("closed_bug_marker.png", :alt => 'closed') %>
+                       <% else %>
+                               <%= image_tag("open_bug_marker.png", :alt => 'open') %>
+                       <% end %>
+               </td>
+               <td><%= link_to bug.id.to_s, :controller => "browse", :action => "bug", :id => bug.id %></td>
+               
+               <% if bug.map_bug_comment[0].user.nil? %> 
+                       <td> <%= bug.map_bug_comment[0].commenter_name %> </td> 
+               <% else %> 
+                       <td><%= link_to h(bug.map_bug_comment[0].user.display_name), :controller => "user", :action => "view", :display_name => bug.map_bug_comment[0].user.display_name %></td>
+        <% end %>
+               <td> <%= htmlize bug.map_bug_comment[0].comment  %> </td>       
+               <td><%= l bug.date_created %></td>
+               <td><%= l bug.last_changed %></td>
+       </tr>
+<% end %>
+</table>
+
+
+<%= render :partial => 'bugs_paging_nav' %>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index d0e8f8e44a92966e50b26cf2851f1a1baa2f750f..531ceb64e1e3c97e2699b09a4963e6895240f955 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1625,6 +1625,13 @@ en:
       closed: "closed bug (near {{place}})"
       new: "new bug (near {{place}})"
       comment: "new comment (near {{place}})"
+    user:
+      title_user: "Bugs submitted or commented on by {{user}}"
+      heading_user: "{{user}}'s bugs"
+      description_user: "Bugs submitted or commented on by {{user}}"
+      id: "Id"
+      last_changed: "Last changed"
+
   javascripts:
     map:
       base:

diff --git a/config/routes.rb b/config/routes.rb
index 2c57f11ca7ce06504f2b66fdf7ce0d06a27ae0e8..17eba541b6a282649b2c318378896bd539d5e279 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -86,6 +86,8 @@ ActionController::Routing::Routes.draw do |map|
   map.connect "api/#{API_VERSION}/bug/:id/close", :controller => 'map_bugs', :action => 'close_bug', :id => /\d+/
   map.connect "api/#{API_VERSION}/bug/:id", :controller => 'map_bugs', :action => 'read', :id => /\d+/, :conditions => { :method => :get }
   map.connect "api/#{API_VERSION}/bug/:id", :controller => 'map_bugs', :action => 'delete', :id => /\d+/, :conditions => { :method => :delete }
+
+  map.connect '/user/:display_name/bugs', :controller => 'map_bugs', :action => 'my_bugs'