diff --git a/app/models/competition_staff.rb b/app/models/competition_staff.rb index bfa1daba..1a949460 100644 --- a/app/models/competition_staff.rb +++ b/app/models/competition_staff.rb @@ -6,7 +6,7 @@ class CompetitionStaff < ActiveRecord::Base belongs_to :competition validates :position, numericality: { only_integer: true } - validates :minimum, numericality: { only_integer: true, greater_than: 0 } + validates :minimum, numericality: { only_integer: true, greater_than_or_equal_to: 0 } validates :maximum, numericality: { only_integer: true, greater_than_or_equal_to: lambda { |obj| obj.minimum } } validates :category, presence: true, inclusion: { in: %w(all teacher student profession) } diff --git a/app/views/competition_teams/_competition_team_form.html.erb b/app/views/competition_teams/_competition_team_form.html.erb index c182c138..359a1d11 100644 --- a/app/views/competition_teams/_competition_team_form.html.erb +++ b/app/views/competition_teams/_competition_team_form.html.erb @@ -16,7 +16,7 @@
- maxlength="20" value="<%= @team.try(:name) %>" class="input-flex-35" style="margin-right: 102px;" placeholder="请输入您的组队名称"/> + maxlength="20" value="<%= @team.try(:name) %>" class="input-flex-35" placeholder="请输入您的组队名称"/>

@@ -24,7 +24,7 @@
- autocomplete="off" placeholder="请您输入老师姓名进行搜索" id="teacher_search_input" + autocomplete="off" placeholder="请您输入老师姓名进行搜索;可以后续再添加导师" id="teacher_search_input" value="<%= @team.try(:id).present? ? @team.teacher.try(:show_name) : (@team_user.user_extensions.identity == 0 ? @team_user.show_name : "") %>"> "> "> @@ -34,7 +34,7 @@
- 添加导师 +

<% end %> @@ -52,7 +52,7 @@ - 添加成员 +

<% end %> diff --git a/app/views/competition_teams/_search_member_list.html.erb b/app/views/competition_teams/_search_member_list.html.erb index 901b034d..bf4a9b8d 100644 --- a/app/views/competition_teams/_search_member_list.html.erb +++ b/app/views/competition_teams/_search_member_list.html.erb @@ -28,6 +28,8 @@ $("#member_notice").hide(); $("#pointerStudent").hide(); e.stopPropagation(); + + $('.add-member-btn').trigger('click'); }); $("body").click(function(){ $(".pointerTeacher").hide(); diff --git a/app/views/competition_teams/_search_teacher_list.html.erb b/app/views/competition_teams/_search_teacher_list.html.erb index de62c131..54538382 100644 --- a/app/views/competition_teams/_search_teacher_list.html.erb +++ b/app/views/competition_teams/_search_teacher_list.html.erb @@ -25,6 +25,7 @@ $("#pointerTeacher").hide(); $("#teacher_notice").hide(); e.stopPropagation(); + $('.add-teacher-btn').trigger('click'); }); $("body").click(function(){ $(".pointerTeacher").hide(); diff --git a/app/views/managements/_competition_list_page.html.erb b/app/views/managements/_competition_list_page.html.erb index 94cacc8d..073d1133 100644 --- a/app/views/managements/_competition_list_page.html.erb +++ b/app/views/managements/_competition_list_page.html.erb @@ -79,9 +79,9 @@ <% @competition.competition_staffs.each do |staff| %>
<%= select_tag('competition_staffs[][category]', options_for_select(CompetitionStaff.category_options, staff.category), class: 'winput-120-30') %> - +   ~   - + @@ -168,9 +168,9 @@