Merge branch 'guange_dev' into szzh

app/controllers/repositories_controller.rb

@@ -127,18 +127,19 @@ update
       end
     else  # 原逻辑
       ##xianbo
-      params[:repository_scm] = "Git"
       @root_path=RepositoriesHelper::ROOT_PATH
       @repository_name=User.current.login.to_s+"/"+params[:repository][:identifier]+".git"
       @project_path=@root_path+"htdocs/"+@repository_name
-      @repository_tag=params[:repository][:upassword] || params[:repository][:password] || '1234'
+      @repository_tag=params[:repository][:upassword] || params[:repository][:password]
       @repo_name=User.current.login.to_s+"_"+params[:repository][:identifier]
       logger.info "htpasswd -mb "+@root_path+"htdocs/user.passwd "+@repo_name+": "+@repository_tag
       logger.info "the value of create repository"+@root_path+": "+@repository_name+": "+@project_path+": "+@repo_name
       attrs = pickup_extra_info
-      params[:repository][:url]=@project_path
+      if((@repository_tag!="")&&params[:repository_scm]=="Git")
+          params[:repository][:url]=@project_path
+      end
       ###xianbo
-      @repository = Repository.factory(params[:repository_scm]||"Git")
+      @repository = Repository.factory(params[:repository_scm])
       @repository.safe_attributes = params[:repository]
       if attrs[:attrs_extra].keys.any?
         @repository.merge_extra_info(attrs[:attrs_extra])
@@ -277,8 +278,7 @@ update
       @course_tag = params[:course]
       project_path_cut = RepositoriesHelper::PROJECT_PATH_CUT
       ip = RepositoriesHelper::REPO_IP_ADDRESS
-      # @repos_url = "http://"+@repository.login.to_s+"_"+@repository.identifier.to_s+"@"+ip.to_s+
-      @repos_url = "http://#{Setting.host_name}/#{@repository.login.to_s}/#{@repository.identifier.to_s}.git"
+      @repos_url = "http://"+@repository.login.to_s+"_"+@repository.identifier.to_s+"@"+ip.to_s+
       @repository.url.slice(project_path_cut, @repository.url.length).to_s
       if @course_tag == 1
         render :action => 'show', :layout => 'base_courses'

app/views/projects/settings/_new_repositories.html.erb

@@ -62,6 +62,16 @@
 <%= labelled_form_for :repository, @repository, :url =>project_repositories_path(@project),:html => {:id => 'repository-form',:method=>"post"} do |f| %>
 <div id="pro_st_edit_ku" class="pro_st_edit_ku">
   <ul>
+    <li >
+      <label class="label02"><%=l(:label_scm)%>：</label>
+      <%= select_tag('repository_scm',
+             options_for_select(["Git"],@repository.class.name.demodulize),
+             :data => {:remote => true, :method => 'get'})%>
+             <% if @repository && ! @repository.class.scm_available %>
+             <span class="c_grey"><%= l(:text_scm_command_not_available) %></span>
+             <% end %>
+    </li>
+
     <% unless judge_main_repository(@project) %>
         <li>
             <label class="label02"><%=l(:field_repository_is_default)%>：</label>
@@ -75,6 +85,11 @@
          <span class="c_grey"><%=l(:text_length_between,:min=>1,:max=>254)<<l(:text_project_identifier_info) %></span>
       <% end %>
     </li>
+    <li >
+      <label class="label02"><span class="c_red">*</span><%=l(:label_password)%></label>
+      <%= f.password_field :upassword, :label=> "", :no_label => true %>
+      <span class="c_grey"><%= l(:label_upassword_info)%></span>
+    </li>
     <div class="cl"></div>
   </ul>
   <a href="#" onclick="$('#repository-form').submit();" class="blue_btn fl ml110"><%=l(:button_save)%></a>

config/routes.rb

@@ -29,7 +29,7 @@ RedmineApp::Application.routes.draw do
   mount Mobile::API => '/api'
 
   # Enable Grack support
-  mount Trustie::Grack.new, at: '/', constraints: lambda { |request| /[-\/\w\.]+\.git\//.match(request.path_info) }, via: [:get, :post]
+  # mount Trustie::Grack.new, at: '/', constraints: lambda { |request| /[-\/\w\.]+\.git\//.match(request.path_info) }, via: [:get, :post]
 
   resources :homework_users
   resources :no_uses