From dbeb0717dfa7d79ca5620736fdbcf4e4c810f731 Mon Sep 17 00:00:00 2001
From: Sylvain <bond.never.die@gmail.com>
Date: Thu, 16 Jun 2016 11:10:56 +0200
Subject: [PATCH] fix show existing collaborator name in project edition

---
 app/assets/javascripts/controllers/projects.coffee.erb | 4 +++-
 app/assets/templates/projects/_form.html.erb           | 2 +-
 db/schema.rb                                           | 8 ++++----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/controllers/projects.coffee.erb b/app/assets/javascripts/controllers/projects.coffee.erb
index 37ccea804..f17b24051 100644
--- a/app/assets/javascripts/controllers/projects.coffee.erb
+++ b/app/assets/javascripts/controllers/projects.coffee.erb
@@ -325,7 +325,9 @@ Application.Controllers.controller "EditProjectController", ["$scope", "$state",
   ## Retrieve the project's details, if an error occured, redirect the user to the projects list page
   $scope.project = projectPromise
 
-  $scope.matchingMembers = []
+  $scope.matchingMembers = $scope.project.project_users.map (u) ->
+    id: u.id
+    name: u.full_name
 
     ## Using the ProjectsController
   new ProjectsController($scope, $state, Project, Machine, Member, Component, Theme, Licence, $document, Diacritics)
diff --git a/app/assets/templates/projects/_form.html.erb b/app/assets/templates/projects/_form.html.erb
index 4279ca290..0f00a6f6a 100644
--- a/app/assets/templates/projects/_form.html.erb
+++ b/app/assets/templates/projects/_form.html.erb
@@ -171,7 +171,7 @@
                 <span ng-bind="$item.name"></span>
                 <input type="hidden" name="project[user_ids][]" value="{{$item.id}}" />
             </ui-select-match>
-            <ui-select-choices repeat="m in matchingMembers" refresh="autoCompleteName($select.search)" refresh-delay="300">
+            <ui-select-choices repeat="m.id as m in matchingMembers" refresh="autoCompleteName($select.search)" refresh-delay="300">
                 <span ng-bind-html="m.name | highlight: $select.search"></span>
             </ui-select-choices>
         </ui-select>
diff --git a/db/schema.rb b/db/schema.rb
index c19f3a0b4..70830f169 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -227,7 +227,7 @@ ActiveRecord::Schema.define(version: 20160613093842) do
     t.boolean  "is_read",                          default: false
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "receiver_type"
+    t.string   "receiver_type",        limit: 255
     t.boolean  "is_send",                          default: false
     t.jsonb    "meta_data",                        default: {}
   end
@@ -368,7 +368,7 @@ ActiveRecord::Schema.define(version: 20160613093842) do
     t.datetime "published_at"
   end
 
-  add_index "projects", ["slug"], name: "index_projects_on_slug", using: :btree
+  add_index "projects", ["slug"], name: "index_projects_on_slug", unique: true, using: :btree
 
   create_table "projects_components", force: :cascade do |t|
     t.integer "project_id"
@@ -438,8 +438,8 @@ ActiveRecord::Schema.define(version: 20160613093842) do
     t.datetime "updated_at"
     t.integer  "availability_id"
     t.datetime "ex_start_at"
-    t.datetime "ex_end_at"
     t.datetime "canceled_at"
+    t.datetime "ex_end_at"
     t.boolean  "offered",         default: false
   end
 
@@ -597,6 +597,7 @@ ActiveRecord::Schema.define(version: 20160613093842) do
   add_index "user_trainings", ["user_id"], name: "index_user_trainings_on_user_id", using: :btree
 
   create_table "users", force: :cascade do |t|
+    t.string   "username",               limit: 255
     t.string   "email",                  limit: 255, default: "",    null: false
     t.string   "encrypted_password",     limit: 255, default: "",    null: false
     t.string   "reset_password_token",   limit: 255
@@ -619,7 +620,6 @@ ActiveRecord::Schema.define(version: 20160613093842) do
     t.boolean  "is_allow_contact",                   default: true
     t.integer  "group_id"
     t.string   "stp_customer_id",        limit: 255
-    t.string   "username",               limit: 255
     t.string   "slug",                   limit: 255
     t.boolean  "is_active",                          default: true
     t.boolean  "invoicing_disabled",                 default: false