Add event filter for group and project show pages

Dmitriy Zaporozhets
1 parent 4675ff46
Showing 12 changed files with 54 additions and 42 deletions Show diff stats
app/assets/javascripts/activities.js.coffee
app/assets/javascripts/dashboard.js.coffee
app/assets/javascripts/dispatcher.js.coffee
app/controllers/application_controller.rb
app/controllers/dashboard_controller.rb
app/controllers/groups_controller.rb
app/controllers/projects_controller.rb
app/helpers/events_helper.rb
app/views/dashboard/_activities.html.haml
app/views/groups/show.html.haml
app/views/projects/show.html.haml
app/views/shared/_event_filter.html.haml
@@ -0,0 +1,31 @@
+class Activities
+  constructor: ->
+    Pager.init 20, true
+    $(".event_filter_link").bind "click", (event) =>
+      event.preventDefault()
+      @toggleFilter($(event.currentTarget))
+      @reloadActivities()
+
+  reloadActivities: ->
+    $(".content_list").html ''
+    Pager.init 20, true
+
+
+  toggleFilter: (sender) ->
+    sender.parent().toggleClass "inactive"
+    event_filters = $.cookie("event_filter")
+    filter = sender.attr("id").split("_")[0]
+    if event_filters
+      event_filters = event_filters.split(",")
+    else
+      event_filters = new Array()
+
+    index = event_filters.indexOf(filter)
+    if index is -1
+      event_filters.push filter
+    else
+      event_filters.splice index, 1
+
+    $.cookie "event_filter", event_filters.join(","), { path: '/' }
+
+@Activities = Activities
 class Dashboard
   constructor: ->
-    Pager.init 20, true
     @initSidebarTab()
  
-    $(".event_filter_link").bind "click", (event) =>
-      event.preventDefault()
-      @toggleFilter($(event.currentTarget))
-      @reloadActivities()
-
     $(".dash-filter").keyup ->
       terms = $(this).val()
       uiBox = $(this).parents('.ui-box').first()
@@ -24,27 +18,6 @@ class Dashboard
  
  
  
-  reloadActivities: ->
-    $(".content_list").html ''
-    Pager.init 20, true
-
-  toggleFilter: (sender) ->
-    sender.parent().toggleClass "inactive"
-    event_filters = $.cookie("event_filter")
-    filter = sender.attr("id").split("_")[0]
-    if event_filters
-      event_filters = event_filters.split(",")
-    else
-      event_filters = new Array()
-
-    index = event_filters.indexOf(filter)
-    if index is -1
-      event_filters.push filter
-    else
-      event_filters.splice index, 1
-
-    $.cookie "event_filter", event_filters.join(","), { path: '/' }
-
   initSidebarTab: ->
     key = "dashboard_sidebar_filter"
  
@@ -20,10 +20,11 @@ class Dispatcher
         Issues.init()
       when 'dashboard:show'
         new Dashboard()
+        new Activities()
       when 'projects:commit:show'
         new Commit()
       when 'groups:show', 'projects:show'
-        Pager.init(20, true)
+        new Activities()
       when 'projects:new', 'projects:edit'
         new Project()
       when 'projects:walls:show'
@@ -155,4 +155,9 @@ class ApplicationController &lt; ActionController::Base
       redirect_to new_profile_password_path and return
     end
   end
+
+  def event_filter
+    filters = cookies['event_filter'].split(',') if cookies['event_filter'].present?
+    @event_filter ||= EventFilter.new(filters)
+  end
 end
@@ -66,9 +66,4 @@ class DashboardController &lt; ApplicationController
   def load_projects
     @projects = current_user.authorized_projects.sorted_by_activity
   end
-
-  def event_filter
-    filters = cookies['event_filter'].split(',') if cookies['event_filter'].present?
-    @event_filter ||= EventFilter.new(filters)
-  end
 end
@@ -31,7 +31,9 @@ class GroupsController &lt; ApplicationController
   end
  
   def show
-    @events = Event.in_projects(project_ids).limit(20).offset(params[:offset] || 0)
+    @events = Event.in_projects(project_ids)
+    @events = event_filter.apply_filter(@events)
+    @events = @events.limit(20).offset(params[:offset] || 0)
     @last_push = current_user.recent_push
  
     respond_to do |format|
@@ -55,7 +55,10 @@ class ProjectsController &lt; Projects::ApplicationController
  
   def show
     limit = (params[:limit] || 20).to_i
-    @events = @project.events.recent.limit(limit).offset(params[:offset] || 0)
+
+    @events = @project.events.recent
+    @events = event_filter.apply_filter(@events)
+    @events = @events.limit(limit).offset(params[:offset] || 0)
  
     # Ensure project default branch is set if it possible
     # Normally it defined on push or during creation
@@ -28,7 +28,7 @@ module EventsHelper
                end
  
     content_tag :div, class: "filter_icon #{inactive}" do
-      link_to dashboard_path, class: 'has_tooltip event_filter_link', id: "#{key}_event_filter", 'data-original-title' => tooltip do
+      link_to request.path, class: 'has_tooltip event_filter_link', id: "#{key}_event_filter", 'data-original-title' => tooltip do
         content_tag :i, nil, class: icon_for_event[key]
       end
     end
 = render "events/event_last_push", event: @last_push
-
-.event_filter
-  = event_filter_link EventFilter.push, 'Push events'
-  = event_filter_link EventFilter.merged, 'Merge events'
-  = event_filter_link EventFilter.comments, 'Comments'
-  = event_filter_link EventFilter.team, 'Team'
+= render 'shared/event_filter'
  
 - if @events.any?
   .content_list
@@ -6,6 +6,7 @@
     &nbsp;
     %span.cgray You will only see events from projects in this group
     %hr
+    = render 'shared/event_filter'
     - if @events.any?
       .content_list
     - else
@@ -3,6 +3,7 @@
 .row
   .span9
     = render "events/event_last_push", event: @last_push
+    = render 'shared/event_filter'
     .content_list
     .loading.hide
   .span3
@@ -0,0 +1,5 @@
+.event_filter
+  = event_filter_link EventFilter.push, 'Push events'
+  = event_filter_link EventFilter.merged, 'Merge events'
+  = event_filter_link EventFilter.comments, 'Comments'
+  = event_filter_link EventFilter.team, 'Team'
...	...	@@ -0,0 +1,31 @@
	1	+class Activities
	2	+ constructor: ->
	3	+ Pager.init 20, true
	4	+ $(".event_filter_link").bind "click", (event) =>
	5	+ event.preventDefault()
	6	+ @toggleFilter($(event.currentTarget))
	7	+ @reloadActivities()
	8	+
	9	+ reloadActivities: ->
	10	+ $(".content_list").html ''
	11	+ Pager.init 20, true
	12	+
	13	+
	14	+ toggleFilter: (sender) ->
	15	+ sender.parent().toggleClass "inactive"
	16	+ event_filters = $.cookie("event_filter")
	17	+ filter = sender.attr("id").split("_")[0]
	18	+ if event_filters
	19	+ event_filters = event_filters.split(",")
	20	+ else
	21	+ event_filters = new Array()
	22	+
	23	+ index = event_filters.indexOf(filter)
	24	+ if index is -1
	25	+ event_filters.push filter
	26	+ else
	27	+ event_filters.splice index, 1
	28	+
	29	+ $.cookie "event_filter", event_filters.join(","), { path: '/' }
	30	+
	31	+@Activities = Activities
...	...
1	1	class Dashboard
2	2	constructor: ->
3		- Pager.init 20, true
4	3	@initSidebarTab()
5	4
6		- $(".event_filter_link").bind "click", (event) =>
7		- event.preventDefault()
8		- @toggleFilter($(event.currentTarget))
9		- @reloadActivities()
10		-
11	5	$(".dash-filter").keyup ->
12	6	terms = $(this).val()
13	7	uiBox = $(this).parents('.ui-box').first()
...	...	@@ -24,27 +18,6 @@ class Dashboard
24	18
25	19
26	20
27		- reloadActivities: ->
28		- $(".content_list").html ''
29		- Pager.init 20, true
30		-
31		- toggleFilter: (sender) ->
32		- sender.parent().toggleClass "inactive"
33		- event_filters = $.cookie("event_filter")
34		- filter = sender.attr("id").split("_")[0]
35		- if event_filters
36		- event_filters = event_filters.split(",")
37		- else
38		- event_filters = new Array()
39		-
40		- index = event_filters.indexOf(filter)
41		- if index is -1
42		- event_filters.push filter
43		- else
44		- event_filters.splice index, 1
45		-
46		- $.cookie "event_filter", event_filters.join(","), { path: '/' }
47		-
48	21	initSidebarTab: ->
49	22	key = "dashboard_sidebar_filter"
50	23
...	...
...	...	@@ -20,10 +20,11 @@ class Dispatcher
20	20	Issues.init()
21	21	when 'dashboard:show'
22	22	new Dashboard()
	23	+ new Activities()
23	24	when 'projects:commit:show'
24	25	new Commit()
25	26	when 'groups:show', 'projects:show'
26		- Pager.init(20, true)
	27	+ new Activities()
27	28	when 'projects:new', 'projects:edit'
28	29	new Project()
29	30	when 'projects:walls:show'
...	...
...	...	@@ -155,4 +155,9 @@ class ApplicationController < ActionController::Base
155	155	redirect_to new_profile_password_path and return
156	156	end
157	157	end
	158	+
	159	+ def event_filter
	160	+ filters = cookies['event_filter'].split(',') if cookies['event_filter'].present?
	161	+ @event_filter \|\|= EventFilter.new(filters)
	162	+ end
158	163	end
...	...
...	...	@@ -66,9 +66,4 @@ class DashboardController < ApplicationController
66	66	def load_projects
67	67	@projects = current_user.authorized_projects.sorted_by_activity
68	68	end
69		-
70		- def event_filter
71		- filters = cookies['event_filter'].split(',') if cookies['event_filter'].present?
72		- @event_filter \|\|= EventFilter.new(filters)
73		- end
74	69	end
...	...
...	...	@@ -31,7 +31,9 @@ class GroupsController < ApplicationController
31	31	end
32	32
33	33	def show
34		- @events = Event.in_projects(project_ids).limit(20).offset(params[:offset] \|\| 0)
	34	+ @events = Event.in_projects(project_ids)
	35	+ @events = event_filter.apply_filter(@events)
	36	+ @events = @events.limit(20).offset(params[:offset] \|\| 0)
35	37	@last_push = current_user.recent_push
36	38
37	39	respond_to do \|format\|
...	...
...	...	@@ -55,7 +55,10 @@ class ProjectsController < Projects::ApplicationController
55	55
56	56	def show
57	57	limit = (params[:limit] \|\| 20).to_i
58		- @events = @project.events.recent.limit(limit).offset(params[:offset] \|\| 0)
	58	+
	59	+ @events = @project.events.recent
	60	+ @events = event_filter.apply_filter(@events)
	61	+ @events = @events.limit(limit).offset(params[:offset] \|\| 0)
59	62
60	63	# Ensure project default branch is set if it possible
61	64	# Normally it defined on push or during creation
...	...
...	...	@@ -28,7 +28,7 @@ module EventsHelper
28	28	end
29	29
30	30	content_tag :div, class: "filter_icon #{inactive}" do
31		- link_to dashboard_path, class: 'has_tooltip event_filter_link', id: "#{key}_event_filter", 'data-original-title' => tooltip do
	31	+ link_to request.path, class: 'has_tooltip event_filter_link', id: "#{key}_event_filter", 'data-original-title' => tooltip do
32	32	content_tag :i, nil, class: icon_for_event[key]
33	33	end
34	34	end
...	...
1	1	= render "events/event_last_push", event: @last_push
2		-
3		-.event_filter
4		- = event_filter_link EventFilter.push, 'Push events'
5		- = event_filter_link EventFilter.merged, 'Merge events'
6		- = event_filter_link EventFilter.comments, 'Comments'
7		- = event_filter_link EventFilter.team, 'Team'
	2	+= render 'shared/event_filter'
8	3
9	4	- if @events.any?
10	5	.content_list
...	...
...	...	@@ -6,6 +6,7 @@
6	6
7	7	%span.cgray You will only see events from projects in this group
8	8	%hr
	9	+ = render 'shared/event_filter'
9	10	- if @events.any?
10	11	.content_list
11	12	- else
...	...