From 871623b7c822641491ee2f093dd7e838be3517d4 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 16 Apr 2015 11:14:12 +0800 Subject: [PATCH 1/3] commit --- db/schema.rb | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/db/schema.rb b/db/schema.rb index b5fcc8a7f..f9ade5aa4 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20150415032102) do +ActiveRecord::Schema.define(:version => 20150409092151) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -969,25 +969,26 @@ ActiveRecord::Schema.define(:version => 20150415032102) do end create_table "projects", :force => true do |t| - t.string "name", :default => "", :null => false + t.string "name", :default => "", :null => false t.text "description" - t.string "homepage", :default => "" - t.boolean "is_public", :default => true, :null => false + t.string "homepage", :default => "" + t.boolean "is_public", :default => true, :null => false t.integer "parent_id" t.datetime "created_on" t.datetime "updated_on" t.string "identifier" - t.integer "status", :default => 1, :null => false + t.integer "status", :default => 1, :null => false t.integer "lft" t.integer "rgt" - t.boolean "inherit_members", :default => false, :null => false + t.boolean "inherit_members", :default => false, :null => false t.integer "project_type" - t.boolean "hidden_repo", :default => false, :null => false - t.integer "attachmenttype", :default => 1 + t.boolean "hidden_repo", :default => false, :null => false + t.integer "attachmenttype", :default => 1 t.integer "user_id" - t.integer "dts_test", :default => 0 + t.integer "dts_test", :default => 0 t.string "enterprise_name" t.integer "organization_id" + t.integer "project_new_type" end add_index "projects", ["lft"], :name => "index_projects_on_lft" @@ -1458,7 +1459,7 @@ ActiveRecord::Schema.define(:version => 20150415032102) do t.string "file_path" t.integer "pack_times", :default => 1 t.integer "pack_size", :default => 0 - t.text "file_digests" + t.string "file_digests" t.datetime "created_at", :null => false t.datetime "updated_at", :null => false end From 17f495e77b6a6524d38e1a8a1e15bde41ba1534e Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 16 Apr 2015 14:59:05 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=20=E7=89=88=E6=9C=AC=20?= =?UTF-8?q?=E5=92=8C=20=E7=89=88=E6=9C=AC=E5=BA=93=20=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E6=94=B9=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/projects_controller.rb | 22 +++++++ app/controllers/repositories_controller.rb | 12 ++-- app/views/projects/settings.html.erb | 6 +- .../settings/_new_repositories.html.erb | 46 ++++++++++++++- app/views/versions/_form.html.erb | 58 +++++++++---------- app/views/versions/edit.html.erb | 4 +- public/stylesheets/project.css | 2 + 7 files changed, 112 insertions(+), 38 deletions(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index c846de965..33de4e137 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -324,6 +324,28 @@ class ProjectsController < ApplicationController @trackers = Tracker.sorted.all @wiki ||= @project.wiki @select_tab = params[:tab] + + #版本库逻辑，由于没有new操作了，所以跳到项目配置就new一个版本库 + if !params[:repository_error_message].to_s.blank? + html = "" + errors = params[:repository_error_message].flatten + errors.each do |error| + ###by xianbo + if(error!=l(:label_repository_path_not_null)) + html << error << ";" + end + ###xianbo + end + if params[:repository] == "pswd_is_null" + html << l(:label_password_not_null)<< ";" + end + flash[:error] = html if !html.to_s.blank? + end + scm = params[:repository_scm] || (Redmine::Scm::Base.all & Setting.enabled_scm).first + @repository = Repository.factory(scm) + @repository.is_default = @project.repository.nil? + @repository.project = @project + end def send_mail_to_member diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index 01e470c91..c90cc1cc3 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -25,6 +25,7 @@ class ChangesetNotFound < Exception; end class InvalidRevisionParam < Exception; end class RepositoriesController < ApplicationController + include ApplicationHelper menu_item :repository menu_item :settings, :only => [:new, :create, :edit, :update, :destroy, :committers] default_search_scope :changesets @@ -122,7 +123,7 @@ update if request.post? && @repository.save redirect_to settings_project_url(@project, :tab => 'repositories') else - render :action => 'new' + redirect_to settings_project_url(@project, :tab => 'repositories') end else # 原逻辑 ##xianbo @@ -167,11 +168,12 @@ update @repository.update_attributes(:login => User.current.login.to_s) end - redirect_to settings_project_url(@project, :tab => 'repositories') - else if(@repository_tag) - render :action => 'newrepo', :layout =>'base_projects' + redirect_to settings_project_url(@project, :tab => 'repositories',:repository_error_message=>@repository.errors.full_messages) + else if(@repository_tag.blank?) + #render :action => 'newrepo', :layout =>'base_projects' + redirect_to settings_project_url(@project, :tab => 'repositories',:repository => "pswd_is_null",:repository_error_message=>@repository.errors.full_messages) else - render :action => 'new', :layout =>'base_projects' + redirect_to settings_project_url(@project, :tab => 'repositories',:repository => @repository,:repository_error_message=>@repository.errors.full_messages) end end diff --git a/app/views/projects/settings.html.erb b/app/views/projects/settings.html.erb index 7775c9c3c..6fe71d7c3 100644 --- a/app/views/projects/settings.html.erb +++ b/app/views/projects/settings.html.erb @@ -3,8 +3,12 @@ $(function(){ <%if @select_tab == "modules"%> project_setting(2); - <% else @select_tab == "versions"%> + <% elsif @select_tab == "versions"%> project_setting(4); + <% elsif @select_tab == "repositories" %> + project_setting(6); + <%else%> + <% end%> }); <% end%> diff --git a/app/views/projects/settings/_new_repositories.html.erb b/app/views/projects/settings/_new_repositories.html.erb index 418b409ee..783c4a24d 100644 --- a/app/views/projects/settings/_new_repositories.html.erb +++ b/app/views/projects/settings/_new_repositories.html.erb @@ -1,3 +1,10 @@ + +<%= error_messages_for 'repository' %> <% project_path_cut = RepositoriesHelper::PROJECT_PATH_CUT %> <% ip = RepositoriesHelper::REPO_IP_ADDRESS %> <% if @project.repositories.any? %> @@ -48,7 +55,44 @@ <% course_tag = @project.project_type %> <% if User.current.allowed_to?(:manage_repository, @project) %> - <%= link_to l(:label_repository_new_repos), newrepo_project_repository_path(@project, :course => course_tag), :class => 'c_blue fl' %>

+ + <%= link_to l(:label_repository_new_repos),"#" , :onclick=>"pro_st_show_ku();", :class => 'c_blue fl' %>

<% end %>
+ +<%= labelled_form_for :repository, @repository, :url =>project_repositories_path(@project),:html => {:id => 'repository-form',:method=>"post"} do |f| %> +
+ + 保存 + 取消 +
+<% end %> \ No newline at end of file diff --git a/app/views/versions/_form.html.erb b/app/views/versions/_form.html.erb index b9759dd4d..734fc459e 100644 --- a/app/views/versions/_form.html.erb +++ b/app/views/versions/_form.html.erb @@ -1,34 +1,34 @@ <%= back_url_hidden_field_tag %> <%= error_messages_for 'version' %> - -
-

- <%= f.text_field :name, :maxlength => 60, :required => true %> -

-

- <%= f.text_field :description, :maxlength => 60, :style => "margin-left:10px;" %> -

-

- - <%= f.select :status, Version::VERSION_STATUSES.collect {|s| [l("version_status_#{s}"), s]} %> - -

-

- - <%= f.text_field :wiki_page_title, :size =>60, :label => :label_wiki_page, :disabled => @project.wiki.nil? %> - -

-

- - <%= f.text_field :effective_date, :size => 10, :readonly => true %> - <%= calendar_for('version_effective_date') %> - -

-

- - <%= f.select :sharing, @version.allowed_sharings.collect {|v| [format_version_sharing(v), v]} %> - -

+
+ <% @version.custom_field_values.each do |value| %>

diff --git a/app/views/versions/edit.html.erb b/app/views/versions/edit.html.erb index 39db07c9d..c249572aa 100644 --- a/app/views/versions/edit.html.erb +++ b/app/views/versions/edit.html.erb @@ -1,7 +1,7 @@

<%=l(:label_version)%>

-<%= labelled_form_for @version do |f| %> +<%= labelled_form_for @version,:html=>{:id=>"new_project_version_form"} do |f| %> <%= render :partial => 'form', :locals => { :f => f } %> -<%= submit_tag l(:button_save) %> + 保存 <% end %> diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css index f0490002f..20a603114 100644 --- a/public/stylesheets/project.css +++ b/public/stylesheets/project.css @@ -404,6 +404,8 @@ a:hover.member_btn{ background:#329cbd;} .pro_st_edit_issues{ display:none; margin-top:20px;} .pro_st_edit_issues ul li{ margin-bottom:10px;} .pro_st_edit_ban{ display:none; margin-top:20px;} +.pro_st_edit_ban_display{ margin-top:20px;} +.pro_st_edit_ban_display ul li{ margin-bottom:10px;} .pro_st_edit_ban ul li{ margin-bottom:10px;} .pro_st_edit_ku{display:none; margin-top:20px;} .pro_st_edit_ku ul li{margin-bottom:10px;} From 9621c35e8b16c0f280e3dff8aa151900887ed81e Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 16 Apr 2015 15:08:46 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=20=E7=89=88=E6=9C=AC=20?= =?UTF-8?q?=E5=92=8C=20=E7=89=88=E6=9C=AC=E5=BA=93=20=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E6=94=B9=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/projects_controller.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 33de4e137..a70488618 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -325,16 +325,15 @@ class ProjectsController < ApplicationController @wiki ||= @project.wiki @select_tab = params[:tab] - #版本库逻辑，由于没有new操作了，所以跳到项目配置就new一个版本库 + # 处理从新建版本库返回来的错误信息 if !params[:repository_error_message].to_s.blank? html = "" errors = params[:repository_error_message].flatten errors.each do |error| - ###by xianbo + # 版本库路径为空的错误信息不予提示 if(error!=l(:label_repository_path_not_null)) html << error << ";" end - ###xianbo end if params[:repository] == "pswd_is_null" html << l(:label_password_not_null)<< ";"