add api users filter and integrate users select2

Dmitriy Zaporozhets
1 parent 163908b3
Showing 7 changed files with 28 additions and 2 deletions Show diff stats
app/assets/javascripts/application.js
app/assets/stylesheets/application.scss
app/assets/stylesheets/common.scss
app/controllers/application_controller.rb
app/helpers/application_helper.rb
app/views/team_members/_form.html.haml
lib/api/users.rb
@@ -17,6 +17,7 @@
 //= require bootstrap
 //= require modernizr
 //= require chosen-jquery
+//= require select2
 //= require raphael
 //= require g.raphael-min
 //= require g.bar-min
@@ -5,6 +5,7 @@
  *= require jquery.ui.gitlab
  *= require jquery.atwho
  *= require chosen
+ *= require select2
  *= require_self
 */
  
@@ -554,3 +554,18 @@ img.emoji {
 .appear-data {
   display: none;
 }
+
+.ajax-users-select {
+  width: 400px;
+}
+
+.user-result {
+  .user-image {
+    float: left;
+  }
+  .user-name {
+  }
+  .user-username {
+    color: #999;
+  }
+}
@@ -152,5 +152,7 @@ class ApplicationController &lt; ActionController::Base
  
   def add_gon_variables
     gon.default_issues_tracker = Project.issues_tracker.default_value
+    gon.api_token = current_user.private_token
+    gon.gravatar_url = request.ssl? ? Gitlab.config.gravatar.ssl_url : Gitlab.config.gravatar.plain_url
   end
 end
@@ -169,4 +169,8 @@ module ApplicationHelper
   end
  
   alias_method :url_to_image, :image_url
+
+  def users_select_tag(id)
+    hidden_field_tag(id, '', class: "ajax-users-select")
+  end
 end
@@ -11,7 +11,9 @@
   %h6 1. Choose people you want in the team
   .clearfix
     = f.label :user_ids, "People"
-    .input= select_tag(:user_ids, options_from_collection_for_select(User.active.not_in_project(@project).alphabetically, :id, :name_with_username), {data: {placeholder: "Select users"}, class: "chosen xxlarge", multiple: true})
+    .input
+      = users_select_tag(:user_ids)
+      -#= select_tag(:user_ids, options_from_collection_for_select(User.active.not_in_project(@project).alphabetically, :id, :name_with_username), {data: {placeholder: "Select users"}, class: "chosen xxlarge", multiple: true})
  
   %h6 2. Set access level for them
   .clearfix
@@ -9,7 +9,8 @@ module Gitlab
       # Example Request:
       #  GET /users
       get do
-        @users = paginate User
+        @users = User.scoped
+        @users = @users.search(params[:search]) if params[:search].present?
         present @users, with: Entities::User
       end
...	...	@@ -17,6 +17,7 @@
17	17	//= require bootstrap
18	18	//= require modernizr
19	19	//= require chosen-jquery
	20	+//= require select2
20	21	//= require raphael
21	22	//= require g.raphael-min
22	23	//= require g.bar-min
...	...
...	...	@@ -5,6 +5,7 @@
5	5	*= require jquery.ui.gitlab
6	6	*= require jquery.atwho
7	7	*= require chosen
	8	+ *= require select2
8	9	*= require_self
9	10	*/
10	11
...	...
...	...	@@ -554,3 +554,18 @@ img.emoji {
554	554	.appear-data {
555	555	display: none;
556	556	}
	557	+
	558	+.ajax-users-select {
	559	+ width: 400px;
	560	+}
	561	+
	562	+.user-result {
	563	+ .user-image {
	564	+ float: left;
	565	+ }
	566	+ .user-name {
	567	+ }
	568	+ .user-username {
	569	+ color: #999;
	570	+ }
	571	+}
...	...
...	...	@@ -152,5 +152,7 @@ class ApplicationController < ActionController::Base
152	152
153	153	def add_gon_variables
154	154	gon.default_issues_tracker = Project.issues_tracker.default_value
	155	+ gon.api_token = current_user.private_token
	156	+ gon.gravatar_url = request.ssl? ? Gitlab.config.gravatar.ssl_url : Gitlab.config.gravatar.plain_url
155	157	end
156	158	end
...	...
...	...	@@ -169,4 +169,8 @@ module ApplicationHelper
169	169	end
170	170
171	171	alias_method :url_to_image, :image_url
	172	+
	173	+ def users_select_tag(id)
	174	+ hidden_field_tag(id, '', class: "ajax-users-select")
	175	+ end
172	176	end
...	...
...	...	@@ -11,7 +11,9 @@
11	11	%h6 1. Choose people you want in the team
12	12	.clearfix
13	13	= f.label :user_ids, "People"
14		- .input= select_tag(:user_ids, options_from_collection_for_select(User.active.not_in_project(@project).alphabetically, :id, :name_with_username), {data: {placeholder: "Select users"}, class: "chosen xxlarge", multiple: true})
	14	+ .input
	15	+ = users_select_tag(:user_ids)
	16	+ -#= select_tag(:user_ids, options_from_collection_for_select(User.active.not_in_project(@project).alphabetically, :id, :name_with_username), {data: {placeholder: "Select users"}, class: "chosen xxlarge", multiple: true})
15	17
16	18	%h6 2. Set access level for them
17	19	.clearfix
...	...
...	...	@@ -9,7 +9,8 @@ module Gitlab
9	9	# Example Request:
10	10	# GET /users
11	11	get do
12		- @users = paginate User
	12	+ @users = User.scoped
	13	+ @users = @users.search(params[:search]) if params[:search].present?
13	14	present @users, with: Entities::User
14	15	end
15	16
...	...