From 470aa7675e07724ff48f159ee12da40409949222 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Fri, 23 Nov 2012 21:31:09 +0300
Subject: [PATCH] Fix project.code-related functionality

---
 app/models/project.rb                           | 2 +-
 app/views/admin/groups/index.html.haml          | 4 ++--
 app/views/admin/groups/show.html.haml           | 4 ++--
 app/views/admin/projects/show.html.haml         | 6 ------
 app/views/dashboard/_groups.html.haml           | 2 +-
 app/views/layouts/_init_auto_complete.html.haml | 2 +-
 app/views/layouts/project_resource.html.haml    | 2 +-
 spec/factories.rb                               | 3 +--
 8 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/app/models/project.rb b/app/models/project.rb
index 2de5b2f..3cd495f 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -86,7 +86,7 @@ class Project < ActiveRecord::Base
 
     def create_by_user(params, user)
       namespace_id = params.delete(:namespace_id)
-      namespace_id ||= current_user.namespace_id
+      namespace_id ||= user.namespace_id
 
       project = Project.new params
 
diff --git a/app/views/admin/groups/index.html.haml b/app/views/admin/groups/index.html.haml
index 6a0794c..534fa1d 100644
--- a/app/views/admin/groups/index.html.haml
+++ b/app/views/admin/groups/index.html.haml
@@ -14,7 +14,7 @@
 %table
   %thead
     %th Name
-    %th Code
+    %th Path
     %th Projects
     %th Edit
     %th.cred Danger Zone!
@@ -22,7 +22,7 @@
   - @groups.each do |group|
     %tr
       %td= link_to group.name, [:admin, group]
-      %td= group.code
+      %td= group.path
       %td= group.projects.count
       %td= link_to 'Edit', edit_admin_group_path(group), id: "edit_#{dom_id(group)}", class: "btn small"
       %td.bgred= link_to 'Destroy', [:admin, group], confirm: "REMOVE #{group.name}? Are you sure?", method: :delete, class: "btn small danger"
diff --git a/app/views/admin/groups/show.html.haml b/app/views/admin/groups/show.html.haml
index 309a10e..0254d98 100644
--- a/app/views/admin/groups/show.html.haml
+++ b/app/views/admin/groups/show.html.haml
@@ -20,9 +20,9 @@
   %tr
     %td
       %b
-        Code:
+        Path:
     %td
-      = @group.code
+      = @group.path
   %tr
     %td
       %b
diff --git a/app/views/admin/projects/show.html.haml b/app/views/admin/projects/show.html.haml
index ae5da37..7e4fe3f 100644
--- a/app/views/admin/projects/show.html.haml
+++ b/app/views/admin/projects/show.html.haml
@@ -29,12 +29,6 @@
   %tr
     %td
       %b
-        Code:
-    %td
-      = @project.code
-  %tr
-    %td
-      %b
         Path:
     %td
       %code= @project.path_to_repo
diff --git a/app/views/dashboard/_groups.html.haml b/app/views/dashboard/_groups.html.haml
index 7c5e9f3..a15396a 100644
--- a/app/views/dashboard/_groups.html.haml
+++ b/app/views/dashboard/_groups.html.haml
@@ -11,7 +11,7 @@
   %ul.unstyled
     - groups.each do |group|
       %li.wll
-        = link_to group_path(id: group.code), class: dom_class(group) do
+        = link_to group_path(id: group.path), class: dom_class(group) do
           %strong.group_name= truncate(group.name, length: 25)
           %span.arrow
             &rarr;
diff --git a/app/views/layouts/_init_auto_complete.html.haml b/app/views/layouts/_init_auto_complete.html.haml
index 502f289..7b2a291 100644
--- a/app/views/layouts/_init_auto_complete.html.haml
+++ b/app/views/layouts/_init_auto_complete.html.haml
@@ -1,6 +1,6 @@
 :javascript
   $(function() {
-    GitLab.GfmAutoComplete.Members.url = "#{ "/api/v2/projects/#{@project.code}/members" if @project }";
+    GitLab.GfmAutoComplete.Members.url = "#{ "/api/v2/projects/#{@project.path}/members" if @project }";
     GitLab.GfmAutoComplete.Members.params.private_token = "#{current_user.private_token}";
 
     GitLab.GfmAutoComplete.Emoji.data = #{raw emoji_autocomplete_source};
diff --git a/app/views/layouts/project_resource.html.haml b/app/views/layouts/project_resource.html.haml
index b1dbe41..2158e34 100644
--- a/app/views/layouts/project_resource.html.haml
+++ b/app/views/layouts/project_resource.html.haml
@@ -7,7 +7,7 @@
     .container
       %ul.main_menu
         = nav_link(html_options: {class: "home #{project_tab_class}"}) do
-          = link_to @project.code, project_path(@project), title: "Project"
+          = link_to @project.path, project_path(@project), title: "Project"
 
         - if @project.repo_exists?
           - if can? current_user, :download_code, @project
diff --git a/spec/factories.rb b/spec/factories.rb
index 51b4c5c..9c63960 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -26,13 +26,12 @@ FactoryGirl.define do
   factory :project do
     sequence(:name) { |n| "project#{n}" }
     path { name.downcase.gsub(/\s/, '_') }
-    code { name.downcase.gsub(/\s/, '_') }
     owner
   end
 
   factory :namespace do
     sequence(:name) { |n| "group#{n}" }
-    code { name.downcase.gsub(/\s/, '_') }
+    path { name.downcase.gsub(/\s/, '_') }
     owner
 
     factory :group do
--
libgit2 0.21.2