Ability to create project with namespace

app/models/group.rb

@@ -14,4 +14,8 @@ class Group < Namespace
   def users
     User.joins(:users_projects).where(users_projects: {project_id: project_ids}).uniq
   end
+
+  def human_name
+    name
+  end
 end

app/models/namespace.rb

@@ -17,4 +17,8 @@ class Namespace < ActiveRecord::Base
   def to_param
     code
   end
+
+  def human_name
+    owner_name
+  end
 end

app/models/project.rb

@@ -81,10 +81,13 @@ class Project < ActiveRecord::Base
     end
 
     def create_by_user(params, user)
+      namespace_id = params.delete(:namespace_id) || namespace.try(:id)
+
       project = Project.new params
 
       Project.transaction do
         project.owner = user
+        project.namespace_id = namespace_id
         project.save!
 
         # Add user as project master

app/models/user.rb

@@ -38,13 +38,16 @@ class User < ActiveRecord::Base
   devise :database_authenticatable, :token_authenticatable, :lockable,
          :recoverable, :rememberable, :trackable, :validatable, :omniauthable
 
-  attr_accessible :email, :password, :password_confirmation, :remember_me, :bio, :name,
+  attr_accessible :email, :password, :password_confirmation, :remember_me, :bio, :name, :username,
                   :skype, :linkedin, :twitter, :dark_scheme, :theme_id, :force_random_password,
                   :extern_uid, :provider, :as => [:default, :admin]
   attr_accessible :projects_limit, :as => :admin
 
   attr_accessor :force_random_password
 
+  # Namespace for personal projects
+  has_one :namespace, class_name: "Namespace", foreign_key: :owner_id, conditions: 'type IS NULL', dependent: :destroy
+
   has_many :keys, dependent: :destroy
   has_many :projects, through: :users_projects
   has_many :users_projects, dependent: :destroy
@@ -112,4 +115,11 @@ class User < ActiveRecord::Base
       self.password = self.password_confirmation = Devise.friendly_token.first(8)
     end
   end
+
+  def namespaces
+    namespaces = []
+    namespaces << self.namespace
+    namespaces = namespaces + Group.all if admin
+    namespaces
+  end
 end