From a668ed7a81eac6df9d1956007fff7d4da69da939 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Tue, 27 Dec 2016 09:07:16 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=BE=85=E5=AE=A1=E6=89=B9=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=EF=BC=8C=E8=A2=AB=E5=85=B6=E4=BB=96=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=91=98=E5=AE=A1=E6=89=B9=E7=9A=84=E5=8E=86=E5=8F=B2=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E4=BE=9D=E6=97=A7=E8=BF=98=E5=AD=98=E5=9C=A8=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index ad25b22a9..5933f2e9c 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1888,7 +1888,7 @@ class UsersController < ApplicationController @applied_message_alls << mess end elsif (message_all.message_type == "AppliedMessage" ) - if (mess.applied_type == "AppliedContest" && mess.status == 0) || (mess.applied_type == "StudentWorksScoresAppeal" && mess.status == 0) || (mess.applied_type == "AppliedProject" && mess.status == 1) || ( mess.applied_type == "ApplyAddSchools" && ApplyAddSchools.where(:school_id => mess.applied_id, :status => 0).count != 0 ) + if (mess.applied_type == "AppliedContest" && mess.status == 0) || (mess.applied_type == "StudentWorksScoresAppeal" && mess.status == 0) || (mess.applied_type == "AppliedProject" && mess.status == 1 && AppliedMessage.where("applied_id = #{mess.applied_id} and status != 1").count == 0) || ( mess.applied_type == "ApplyAddSchools" && ApplyAddSchools.where(:school_id => mess.applied_id, :status => 0).count != 0 ) @applied_message_alls << mess end elsif message_all.message_type == "CourseMessage" @@ -2099,7 +2099,7 @@ class UsersController < ApplicationController @message_alls << mess end elsif (message_all.message_type == "AppliedMessage" ) - if (mess.applied_type == "AppliedContest" && mess.status == 0) || (mess.applied_type == "StudentWorksScoresAppeal" && mess.status == 0) || (mess.applied_type == "AppliedProject" && mess.status == 1) || ( mess.applied_type == "ApplyAddSchools" && ApplyAddSchools.where(:school_id => mess.applied_id, :status => 0).count != 0 ) + if (mess.applied_type == "AppliedContest" && mess.status == 0) || (mess.applied_type == "StudentWorksScoresAppeal" && mess.status == 0) || (mess.applied_type == "AppliedProject" && mess.status == 1 && AppliedMessage.where("applied_id = #{mess.applied_id} and status != 1").count == 0) || ( mess.applied_type == "ApplyAddSchools" && ApplyAddSchools.where(:school_id => mess.applied_id, :status => 0).count != 0 ) @message_alls << mess end elsif message_all.message_type == "CourseMessage" From cfa81fc79d50b08e1d084eab9ae528b82daf7473 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Tue, 27 Dec 2016 16:18:23 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=B0=E5=BB=BA/=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E9=87=8C=E7=A8=8B=E7=A2=91=EF=BC=8C=E5=90=8D=E5=AD=97=E7=9B=B8?= =?UTF-8?q?=E5=90=8C=E6=97=B6=E6=8F=90=E7=A4=BA=E6=9B=B4=E6=94=B9=EF=BC=9B?= =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E7=9A=84=E8=B5=84=E6=BA=90=E5=BA=93=E5=8A=A8?= =?UTF-8?q?=E6=80=81=E6=97=A0=E6=B3=95=E8=A2=AB=E7=AD=9B=E9=80=89=EF=BC=9B?= =?UTF-8?q?=E5=BE=85=E5=AE=A1=E6=89=B9=E6=B6=88=E6=81=AF=E6=97=A7=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E4=BE=9D=E6=97=A7=E5=AD=98=E5=9C=A8=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/versions_controller.rb | 29 ++++-- app/views/account/email_valid.html.erb | 3 +- .../projects/settings/_new_versions.html.erb | 90 +++++++------------ .../settings/_new_versions_form.html.erb | 33 +++++-- .../repositories/_dir_list_content.html.erb | 2 - app/views/users/_user_activities.html.erb | 2 + app/views/versions/_edit.html.erb | 31 +++++-- app/views/versions/_new_milestone.html.erb | 35 ++++++-- .../_version_name_repetition_tip.html.erb | 22 +++++ app/views/versions/create.js.erb | 7 +- config/routes.rb | 1 + 11 files changed, 163 insertions(+), 92 deletions(-) create mode 100644 app/views/versions/_version_name_repetition_tip.html.erb diff --git a/app/controllers/versions_controller.rb b/app/controllers/versions_controller.rb index 7b4695d3c..794a3b0ea 100644 --- a/app/controllers/versions_controller.rb +++ b/app/controllers/versions_controller.rb @@ -19,11 +19,11 @@ class VersionsController < ApplicationController layout "base_projects" menu_item :roadmap model_object Version - before_filter :find_model_object, :except => [:index, :new, :create, :close_completed] + before_filter :find_model_object, :except => [:index, :new, :create, :close_completed,:judge_version_title] #before_filter :find_model_object_contest, :except => [:index, :new, :create] - before_filter :find_project_from_association, :except => [:index, :new, :create, :close_completed] - before_filter :find_project_by_project_id, :only => [:index, :new, :create, :close_completed] - before_filter :authorize + before_filter :find_project_from_association, :except => [:index, :new, :create, :close_completed, :judge_version_title] + before_filter :find_project_by_project_id, :only => [:index, :new, :create, :close_completed,:judge_version_title] + before_filter :authorize, :except => [:judge_version_title] accept_api_auth :index, :show, :create, :update, :destroy @@ -189,9 +189,9 @@ class VersionsController < ApplicationController end else respond_to do |format| - format.html { flash[:error] = @version.errors.full_messages.flatten.to_s - redirect_to settings_project_url(@project, :tab => 'versions') } - format.js { render :action => 'new' } + # format.html { flash[:error] = @version.errors.full_messages.flatten.to_s + # redirect_to settings_project_url(@project, :tab => 'versions') } + format.js { @error = @version.errors.full_messages.flatten.to_s } format.api { render_validation_errors(@version) } end end @@ -275,6 +275,21 @@ class VersionsController < ApplicationController redirect_to settings_contest_url(@contest, :tab => 'versions') end + # 判断里程碑是否重名 + def judge_version_title + begin + version = Version.where(:name => params[:version_name]).first + if version.blank? + result = {:result => true} + else + result = {:result => false} + end + rescue Exception => e + puts e + end + render :json => result + end + def destroy begin project = @version.project diff --git a/app/views/account/email_valid.html.erb b/app/views/account/email_valid.html.erb index fcda47f72..611902047 100644 --- a/app/views/account/email_valid.html.erb +++ b/app/views/account/email_valid.html.erb @@ -42,8 +42,7 @@

<%= l(:notice_email_register_time) %>

- <%= l(:notice_email_arrival)%> - <%= @user.mail %> + <%= l(:notice_email_arrival)%> ： <%= @user.mail %>

<%= l(:label_check_email)%> diff --git a/app/views/projects/settings/_new_versions.html.erb b/app/views/projects/settings/_new_versions.html.erb index 6f35a73cf..aeb6dbb22 100644 --- a/app/views/projects/settings/_new_versions.html.erb +++ b/app/views/projects/settings/_new_versions.html.erb @@ -1,5 +1,5 @@ <% if @project.shared_versions.empty? %> -

<%= l(:milestone_no_data) %>

+

<%= l(:milestone_no_data) %>

<% end %>
新建里程碑 @@ -8,73 +8,45 @@
<% if @project.shared_versions.any? %> -
- - - - - - - - - - - - <% @project.shared_versions.reverse.each do |version| %> +
+
名称结束日期描述状态操作
+ - - - - - + + + + + - <% end %> - -
<%= format_date(version.effective_date) %><%= l("version_status_#{version.status}") %> - <% if version.project == @project && User.current.allowed_to?(:manage_versions, @project) %> - <%= link_to l(:button_edit), edit_version_path(version, :is_setting => true), :class => 'sy_btn_blue mr5', :remote => true %> - <%= delete_link_version version_path(version, :is_setting => true), :class=>"sy_btn_grey mr5", :remote => true %> - <% end %> - 名称结束日期描述状态操作
-
+ + + <% @project.shared_versions.reverse.each do |version| %> + + + <%= link_to version.name, version_path(version), :class => "c_blue02" %> + + <%= format_date(version.effective_date) %> + <%=h version.description %> + <%= l("version_status_#{version.status}") %> + + <% if version.project == @project && User.current.allowed_to?(:manage_versions, @project) %> + <%= link_to l(:button_edit), edit_version_path(version, :is_setting => true), :class => 'sy_btn_blue mr5', :remote => true %> + <%= delete_link_version version_path(version, :is_setting => true), :class=>"sy_btn_grey mr5", :remote => true %> + <% end %> + + + <% end %> + + +
<% end %> \ No newline at end of file diff --git a/app/views/projects/settings/_new_versions_form.html.erb b/app/views/projects/settings/_new_versions_form.html.erb index f6dc90d91..a69e1a0e5 100644 --- a/app/views/projects/settings/_new_versions_form.html.erb +++ b/app/views/projects/settings/_new_versions_form.html.erb @@ -1,10 +1,10 @@ -<%= form_for :version, :url => project_versions_path(@project, :is_setting => true),:html=>{:id=>"new_project_version_form", :remote => true} do |f| %> +<%= form_for :version, :url => project_versions_path(@project, :is_setting => true),:html=>{:id => "setting_new_project_version_form", :remote => true} do |f| %> <% end %> \ No newline at end of file diff --git a/app/views/repositories/_dir_list_content.html.erb b/app/views/repositories/_dir_list_content.html.erb index 287eabfbf..d69c3af04 100644 --- a/app/views/repositories/_dir_list_content.html.erb +++ b/app/views/repositories/_dir_list_content.html.erb @@ -48,13 +48,11 @@ diff --git a/app/views/versions/_new_milestone.html.erb b/app/views/versions/_new_milestone.html.erb index b89936f3e..81f3721f6 100644 --- a/app/views/versions/_new_milestone.html.erb +++ b/app/views/versions/_new_milestone.html.erb @@ -8,13 +8,15 @@
<%#= form_tag( url_for(:controller => 'versions', :action => 'update', :is_setting => true, :is_index => @is_index), :remote => true, :id => 'project_applied_form') do %> - <%= form_for :version, :url => project_versions_path(@project, :is_setting => @is_setting, :is_issue => @is_issue, :is_create => @is_create, :issue_project_id => @issue_project_id),:html => {:id=>"popub_new_project_version_form", :remote => @is_setting ? true : false} do |f| %> + <%= form_for :version, :url => project_versions_path(@project, :is_setting => @is_setting, :is_issue => @is_issue, :is_create => @is_create, :issue_project_id => @issue_project_id), + :html => {:id => "popub_new_project_version_form", :remote => @is_setting ? true : false} do |f| %> <%#= labelled_form_for @version, :html => {:id => "popub_new_project_version_form", :remote => true, :is_setting => true, :is_index => params[:is_index] } do |f| %>