Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop

app/controllers/organizations_controller.rb

@@ -37,6 +37,19 @@ class OrganizationsController < ApplicationController
     @organization = Organization.new
     render :layout => 'new_base'
   end
+
+  def edit
+    @organization = Organization.find(params[:id])
+  end
+
+  def destroy
+    @organization = Organization.find(params[:id])
+    @organization.destroy
+    respond_to do |format|
+      format.html{ redirect_to admin_organization_path }
+    end
+  end
+
   def create
     @organization = Organization.new
     @organization.name = params[:organization][:name]
@@ -142,6 +155,12 @@ class OrganizationsController < ApplicationController
     # end
   end
 
+  def cancel_homepage
+    @org = Organization.find(params[:id])
+    @org.home_id = nil
+    @org.save
+  end
+
   def autocomplete_search
     @project = Project.find(params[:project_id])
     #@flag = params[:flag] || false

app/controllers/repositories_controller.rb

@@ -31,7 +31,7 @@ class RepositoriesController < ApplicationController
   default_search_scope :changesets
 
   before_filter :find_project_by_project_id, :only => [:new, :create, :newrepo]
-  before_filter :find_repository, :only => [:edit, :update, :destroy, :committers]
+  before_filter :find_repository, :only => [:edit, :update, :destroy, :committers, :forked]
   before_filter :find_project_repository, :except => [:new, :create, :newcreate, :edit, :update, :destroy, :committers, :newrepo,:to_gitlab]
   before_filter :find_changeset, :only => [:revision, :add_related_issue, :remove_related_issue]
   before_filter :authorize , :except => [:newrepo,:newcreate,:fork, :to_gitlab, :forked]
@@ -69,9 +69,11 @@ class RepositoriesController < ApplicationController
       project = project_from_current_project(@project.id, User.current.id)
       redirect_to project_path(project)
     else
-      # 单个用户只能拥有一个名字一样的版本库，否则不能fork
-      # if is_sigle_identifier?(User.current, @repository.identifier)
-        # REDO: 那些人有权限forked项目
+      # 自己不能fork自己的项目
+      if User.current.id == @project.user_id
+        flash[:notice] = l(:project_gitlab_fork_own)
+        redirect_to repository_url(@repository)
+      else
         g = Gitlab.client
         gproject = g.fork(@project.gpid, User.current.gid)
         if gproject
@@ -79,10 +81,7 @@ class RepositoriesController < ApplicationController
           forked_count = @project.forked_count.to_i + 1
           @project.update_attributes(:forked_count => forked_count)
         end
-      # else
-      #   flash[:notice] = l(:project_gitlab_fork_double_message)
-      #   redirect_to settings_project_url(@project, :tab => 'repositories')
-      # end
+      end
     end
 
   end

app/views/repositories/show.html.erb

@@ -26,8 +26,9 @@
       <a href="javascript:void(0);" class="clone_btn mt5" onclick="jsCopy()"><span class="vl_copy" title="点击复制版本库地址"></span></a>
       <div class="fl mt5 ml15"><a href="javascript:void(0);" class="vl_btn fb" onclick="zip()"><span class="vl_zip"></span>ZIP</a> </div>
       <!--<div class="fr mt5"><a href="javascript:void(0);" class="vl_btn fb" onclick="zip()"><span class="vl_fork"></span>Fork</a> <span href="javascript:void(0);" class="vl_btn_2 fb">0</span> </div>-->
-
+      <% unless User.current.id == @project.user_id %>
           <div class="fr mt5"><%= link_to "<span class='vl_fork'></span>".html_safe+"Fork", {:controller => 'repositories', :action => 'forked'}, :class=>"vl_btn"%>
+      <% end %>
         <%#= link_to "<span id='span'>My span&nbsp;</span>#{@user.profile.my_data}".html_safe, "#", class: 'button white' %>
 
         <span href="javascript:void(0);" class="vl_btn_2 fb"><%= @project.forked_count.to_i %></span> </div>

config/locales/projects/zh.yml

@@ -91,6 +91,7 @@ zh:
   project_gitlab_create_repository: 新版本库
   project_gitlab_create_double_message: 亲，您已经创建了一个同名的版本库，换个特别点的名字同名的概率就会变小哦~
   project_gitlab_fork_double_message: 亲，您已经有了一个相同名字的版本库，所以不能fork改版本库~
+  project_gitlab_fork_own: 您好，您当前所fork的项目为您自己创建的项目，平台暂时不提供fork自己项目的功能，敬请谅解！
 
 
   label_project_more: 更多