From 72d683bdb70ff1ba66113175c23177f08b68df3a Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Fri, 27 Mar 2015 19:50:01 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E4=B8=8E=E9=80=80=E5=87=BA=E8=AF=BE=E7=A8=8Bjs=E5=88=B7?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/courses_controller.rb | 6 +++--- app/helpers/courses_helper.rb | 2 +- app/views/bids/_new_homework_form.html.erb | 3 ++- app/views/courses/_set_join.js.erb | 2 +- app/views/layouts/base_courses.html.erb | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index ebdb18c08..7b3130026 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -30,19 +30,19 @@ class CoursesController < ApplicationController def join if User.current.logged? cs = CoursesService.new - join = cs.join_course params,User.current + user = User.current + join = cs.join_course params,user @state = join[:state] course = join[:course] else @state = 5 #未登录 end respond_to do |format| - format.js { render :partial => 'set_join', :locals => {:user => User.current, :course => course, :object_id => params[:object_id]} } + format.js { render :partial => 'set_join', :locals => {:user => user, :course => course, :object_id => params[:object_id]} } end rescue Exception => e @state = 4 #已经加入了课程 respond_to do |format| - # format.html { redirect_to_referer_or {render :text => (watching ? 'Watcher added.' : 'Watcher removed.'), :layout => true}} format.js { render :partial => 'set_join', :locals => {:user => User.current, :course => nil, :object_id => nil} } end end diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb index 384fcaa9b..408783934 100644 --- a/app/helpers/courses_helper.rb +++ b/app/helpers/courses_helper.rb @@ -677,7 +677,7 @@ module CoursesHelper #加入课程、退出课程按钮 def join_in_course_header(course, user, options=[]) if user.logged? - joined = user.member_of_course? course + joined = course.members.map{|member| member.user_id}.include? user.id text = joined ? ("".html_safe + l(:label_course_exit_student)) : ("".html_safe + l(:label_course_join_student)) url = joined ? join_path(:object_id => course.id) : try_join_path(:object_id => course.id) method = joined ? 'delete' : 'post' diff --git a/app/views/bids/_new_homework_form.html.erb b/app/views/bids/_new_homework_form.html.erb index 210d96891..9f3bf30c7 100644 --- a/app/views/bids/_new_homework_form.html.erb +++ b/app/views/bids/_new_homework_form.html.erb @@ -33,8 +33,9 @@

  • - + <%= render :partial => 'attachments/new_form', :locals => {:container => bid} %> +
  • <%= l(:button_create)%> diff --git a/app/views/courses/_set_join.js.erb b/app/views/courses/_set_join.js.erb index f65d6e98b..81c7b42e5 100644 --- a/app/views/courses/_set_join.js.erb +++ b/app/views/courses/_set_join.js.erb @@ -1,5 +1,5 @@ <% if object_id%> - $("#<%=object_id%>").replaceWith('<%= escape_javascript join_in_course(course, user) %>'); + $("#join_in_course_header").html("<%= escape_javascript(join_in_course_header(course, user)) %>"); <% end %> <% if @state %> <% if @state == 0 %> diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb index 471902c7a..d35e31dd7 100644 --- a/app/views/layouts/base_courses.html.erb +++ b/app/views/layouts/base_courses.html.erb @@ -77,7 +77,7 @@ <%= set_course_time @course%> <%= link_to "#{l(:button_copy)}".html_safe, copy_course_course_path(@course.id), :class => "pr_join_a" %> <% else%> - <%= join_in_course_header(@course, User.current) %> +
    <%= join_in_course_header(@course, User.current) %>
    <% end%>
    From cee08d9c585e404f821c2433309820f631c42830 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Fri, 27 Mar 2015 20:05:00 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8A=A0=E5=85=A5?= =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=BC=B9=E5=87=BA=E6=A1=86=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/courses/_set_join.js.erb | 1 + app/views/courses/new_join.js.erb | 11 ++- app/views/projects/_new_join.html.erb | 101 +++++++++++--------------- 3 files changed, 53 insertions(+), 60 deletions(-) diff --git a/app/views/courses/_set_join.js.erb b/app/views/courses/_set_join.js.erb index 81c7b42e5..0ccefdba1 100644 --- a/app/views/courses/_set_join.js.erb +++ b/app/views/courses/_set_join.js.erb @@ -4,6 +4,7 @@ <% if @state %> <% if @state == 0 %> alert("加入成功"); + hideModal("#popbox02"); <% elsif @state == 1 %> alert("密码错误"); <% elsif @state == 2 %> diff --git a/app/views/courses/new_join.js.erb b/app/views/courses/new_join.js.erb index c0a6f4a50..00245f8cb 100644 --- a/app/views/courses/new_join.js.erb +++ b/app/views/courses/new_join.js.erb @@ -1,3 +1,8 @@ -$('#ajax-modal').html('<%= escape_javascript(render :partial => 'projects/new_join', :locals => {:course => @course}) %>'); -showModal('ajax-modal', '400px'); -$('#ajax-modal').addClass('new-watcher'); +$('#ajax-modal').html('<%= escape_javascript(render :partial => 'projects/new_join', locals: { :course => @course}) %>'); +showModal('ajax-modal', '500px'); +$('#ajax-modal').css('height','100px'); +$('#ajax-modal').siblings().remove(); +$('#ajax-modal').before("" + +""); +$('#ajax-modal').parent().css("top","").css("left",""); +$('#ajax-modal').parent().addClass("anonymos"); diff --git a/app/views/projects/_new_join.html.erb b/app/views/projects/_new_join.html.erb index b1704ec32..c823f5ed0 100644 --- a/app/views/projects/_new_join.html.erb +++ b/app/views/projects/_new_join.html.erb @@ -1,62 +1,49 @@ - + + + + -

    请输入课程密码

    + + -<%= form_tag({:controller => 'courses', - :action => 'join', - :object_id => course.id}, - :remote => true, - :method => :post, - :id => 'new-watcher-form') do %> - - - - -
    - <%= text_field_tag 'course_password', nil, :style=>'width:100%'%> + +
    +
    + <%= form_tag({:controller => 'courses', + :action => 'join', + :object_id => course.id}, + :remote => true, + :method => :post, + :id => 'new_join_course') do %> + + <%= text_field_tag 'course_password', nil, :style=>'width:300px;'%> +
    + + 确  定 + + + 取  消 + +
    + <% end %>
    +
    + + + -

    - <%= submit_tag l(:label_new_join), :name => nil, :class => "bid_btn", :onclick => "hideModal(this);" %> - <%= submit_tag l(:button_cancel), :name => nil, :class => "bid_btn", :onclick => "hideModal(this);", :type => 'button' %> -

    - -
    -
    -<% end %>