simple refactoring

Andrey Kumanyaev · Dmitriy Zaporozhets
1 parent a5ce8696
Showing 4 changed files with 19 additions and 19 deletions Show diff stats
app/assets/javascripts/dashboard.js.coffee
app/assets/javascripts/merge_requests.js.coffee
spec/factories/user_team_project_relationships.rb
spec/factories/user_team_user_relationships.rb
@@ -4,11 +4,11 @@ window.dashboardPage = -&gt;
     event.preventDefault()
     toggleFilter $(this)
     reloadActivities()
-    
+
 reloadActivities = ->
   $(".content_list").html ''
   Pager.init 20, true
-  
+
 toggleFilter = (sender) ->
   sender.parent().toggleClass "inactive"
   event_filters = $.cookie("event_filter")
@@ -17,11 +17,11 @@ toggleFilter = (sender) -&gt;
     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(",")
 #
 # * Filter merge requests
-# 
+#
 @merge_requestsPage = ->
   $('#assignee_id').chosen()
   $('#milestone_id').chosen()
@@ -8,16 +8,16 @@
     $(this).closest('form').submit()
 class MergeRequest
-  
+
   constructor: (@opts) ->
     this.$el = $('.merge-request')
     @diffs_loaded = false
     @commits_loaded = false
-    
+
     this.activateTab(@opts.action)
-    
+
     this.bindEvents()
-    
+
     this.initMergeWidget()
     this.$('.show-all-commits').on 'click', =>
       this.showAllCommits()
@@ -28,7 +28,7 @@ class MergeRequest
   initMergeWidget: ->
     this.showState( @opts.current_state )
-    
+
     if this.$('.automerge_widget').length and @opts.check_enable
       $.get @opts.url_to_automerge_check, (data) =>
         this.showState( data.state )
@@ -42,12 +42,12 @@ class MergeRequest
   bindEvents: ->
     this.$('.nav-tabs').on 'click', 'a', (event) =>
       a = $(event.currentTarget)
-      
+
       href = a.attr('href')
       History.replaceState {path: href}, document.title, href
-      
+
       event.preventDefault()
-      
+
     this.$('.nav-tabs').on 'click', 'li', (event) =>
       this.activateTab($(event.currentTarget).data('action'))
@@ -2,8 +2,8 @@
 FactoryGirl.define do
   factory :user_team_project_relationship do
-    project_id 1
-    user_team_id 1
-    greatest_access 1
+    project
+    user_team
+    greatest_access { UsersProject::MASTER }
   end
 end
@@ -2,9 +2,9 @@
 FactoryGirl.define do
   factory :user_team_user_relationship do
-    user_id 1
-    user_team_id 1
+    user
+    user_team
     group_admin false
-    permission 1
+    permission { UsersProject::MASTER }
   end
 end
	@@ -4,11 +4,11 @@ window.dashboardPage = ->		@@ -4,11 +4,11 @@ window.dashboardPage = ->
4	event.preventDefault()	4	event.preventDefault()
5	toggleFilter $(this)	5	toggleFilter $(this)
6	reloadActivities()	6	reloadActivities()
7	-	7	+
8	reloadActivities = ->	8	reloadActivities = ->
9	$(".content_list").html ''	9	$(".content_list").html ''
10	Pager.init 20, true	10	Pager.init 20, true
11	-	11	+
12	toggleFilter = (sender) ->	12	toggleFilter = (sender) ->
13	sender.parent().toggleClass "inactive"	13	sender.parent().toggleClass "inactive"
14	event_filters = $.cookie("event_filter")	14	event_filters = $.cookie("event_filter")
	@@ -17,11 +17,11 @@ toggleFilter = (sender) ->		@@ -17,11 +17,11 @@ toggleFilter = (sender) ->
17	event_filters = event_filters.split(",")	17	event_filters = event_filters.split(",")
18	else	18	else
19	event_filters = new Array()	19	event_filters = new Array()
20	-	20	+
21	index = event_filters.indexOf(filter)	21	index = event_filters.indexOf(filter)
22	if index is -1	22	if index is -1
23	event_filters.push filter	23	event_filters.push filter
24	else	24	else
25	event_filters.splice index, 1	25	event_filters.splice index, 1
26	-	26	+
27	$.cookie "event_filter", event_filters.join(",")	27	$.cookie "event_filter", event_filters.join(",")
1	#	1	#
2	# * Filter merge requests	2	# * Filter merge requests
3	-#	3	+#
4	@merge_requestsPage = ->	4	@merge_requestsPage = ->
5	$('#assignee_id').chosen()	5	$('#assignee_id').chosen()
6	$('#milestone_id').chosen()	6	$('#milestone_id').chosen()
	@@ -8,16 +8,16 @@		@@ -8,16 +8,16 @@
8	$(this).closest('form').submit()	8	$(this).closest('form').submit()
9		9
10	class MergeRequest	10	class MergeRequest
11	-	11	+
12	constructor: (@opts) ->	12	constructor: (@opts) ->
13	this.$el = $('.merge-request')	13	this.$el = $('.merge-request')
14	@diffs_loaded = false	14	@diffs_loaded = false
15	@commits_loaded = false	15	@commits_loaded = false
16	-	16	+
17	this.activateTab(@opts.action)	17	this.activateTab(@opts.action)
18	-	18	+
19	this.bindEvents()	19	this.bindEvents()
20	-	20	+
21	this.initMergeWidget()	21	this.initMergeWidget()
22	this.$('.show-all-commits').on 'click', =>	22	this.$('.show-all-commits').on 'click', =>
23	this.showAllCommits()	23	this.showAllCommits()
	@@ -28,7 +28,7 @@ class MergeRequest		@@ -28,7 +28,7 @@ class MergeRequest
28		28
29	initMergeWidget: ->	29	initMergeWidget: ->
30	this.showState( @opts.current_state )	30	this.showState( @opts.current_state )
31	-	31	+
32	if this.$('.automerge_widget').length and @opts.check_enable	32	if this.$('.automerge_widget').length and @opts.check_enable
33	$.get @opts.url_to_automerge_check, (data) =>	33	$.get @opts.url_to_automerge_check, (data) =>
34	this.showState( data.state )	34	this.showState( data.state )
	@@ -42,12 +42,12 @@ class MergeRequest		@@ -42,12 +42,12 @@ class MergeRequest
42	bindEvents: ->	42	bindEvents: ->
43	this.$('.nav-tabs').on 'click', 'a', (event) =>	43	this.$('.nav-tabs').on 'click', 'a', (event) =>
44	a = $(event.currentTarget)	44	a = $(event.currentTarget)
45	-	45	+
46	href = a.attr('href')	46	href = a.attr('href')
47	History.replaceState {path: href}, document.title, href	47	History.replaceState {path: href}, document.title, href
48	-	48	+
49	event.preventDefault()	49	event.preventDefault()
50	-	50	+
51	this.$('.nav-tabs').on 'click', 'li', (event) =>	51	this.$('.nav-tabs').on 'click', 'li', (event) =>
52	this.activateTab($(event.currentTarget).data('action'))	52	this.activateTab($(event.currentTarget).data('action'))
53		53