diff --git a/app/api/mobile/apis/comments.rb b/app/api/mobile/apis/comments.rb index 7a7f17d8f..75932d60f 100644 --- a/app/api/mobile/apis/comments.rb +++ b/app/api/mobile/apis/comments.rb @@ -87,6 +87,17 @@ module Mobile present :status, 0 end + desc '课程留言列表' + params do + optional :token, type: String + end + get ':id/course_message' do + cs = CommentService.new + jours = cs.course_messages params,(current_user.nil? ? User.find(2):current_user) + present :data, jours, with: Mobile::Entities::Jours + present :status, 0 + end + end end end diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb index 87c028354..2cf404ffb 100644 --- a/app/controllers/account_controller.rb +++ b/app/controllers/account_controller.rb @@ -125,7 +125,7 @@ class AccountController < ApplicationController #register_by_email_activation(@user) unless @user.new_record? flash[:notice] = l(:notice_account_register_done) - render action: 'email_valid', locals: {:mail => user.mail} + render action: 'email_valid', locals: {:mail => @user.mail} end when '3' #register_automatically(@user) diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb index 69aae8008..c77ebe704 100644 --- a/app/controllers/admin_controller.rb +++ b/app/controllers/admin_controller.rb @@ -336,4 +336,8 @@ class AdminController < ApplicationController end + def create_version + + end + end diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 6ab757336..052df384e 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -333,13 +333,21 @@ class ProjectsController < ApplicationController end def send_mail_to_member - unless params[:mail].nil? + + if !params[:mail].nil? && User.find_by_mail(params[:mail].to_s).nil? email = params[:mail] Mailer.send_invite_in_project(email, @project, User.current).deliver + @is_zhuce =false + else + @is_zhuce = true + end + respond_to do |format| + format.js end end #发送邮件邀请新用户 def invite_members_by_mail + @is_zhuce =false respond_to do |format| format.html format.js diff --git a/app/services/comment_service.rb b/app/services/comment_service.rb index 876caaaf3..e74cc902b 100644 --- a/app/services/comment_service.rb +++ b/app/services/comment_service.rb @@ -87,4 +87,15 @@ class CommentService @memo end + #课程留言列表 + def course_messages params,current_user + @course = ::Course.find(params[:id]) + if (current_user.admin? || @course.is_public == 1 || (@course.is_public == 0 && current_user.member_of_course?(@course))) + @jours = @course.journals_for_messages.where('m_parent_id IS NULL').order('created_on DESC') + else + raise '403' + end + @jours + end + end \ No newline at end of file diff --git a/app/services/courses_service.rb b/app/services/courses_service.rb index 22b7f8cd3..46b59ef08 100644 --- a/app/services/courses_service.rb +++ b/app/services/courses_service.rb @@ -158,9 +158,9 @@ class CoursesService #显示课程 - def show_course(params,currnet_user) + def show_course(params,current_user) course = Course.find(params[:id]) - unless (course.is_public == 1 || currnet_user.member_of_course?(@course)|| currnet_user.admin?) + unless (course.is_public == 1 || current_user.member_of_course?(course) || current_user.admin?) raise '403' end {:course => course,:img_url => url_to_avatar(course),:current_user_is_member => current_user.member_of_course?(course),:current_user_is_teacher => is_course_teacher(current_user,course)} diff --git a/app/views/admin/mobile_version.html.erb b/app/views/admin/mobile_version.html.erb index f8fd4ad6c..293b0ec46 100644 --- a/app/views/admin/mobile_version.html.erb +++ b/app/views/admin/mobile_version.html.erb @@ -2,9 +2,8 @@ 发布新版本
-

当前版本:
diff --git a/app/views/poll/poll_result.html.erb b/app/views/poll/poll_result.html.erb index a7cb415b3..47f3b179d 100644 --- a/app/views/poll/poll_result.html.erb +++ b/app/views/poll/poll_result.html.erb @@ -4,9 +4,7 @@

<%= @poll.polls_name.empty? ? l(:label_poll_new) : @poll.polls_name %>

-

- <%= @poll.polls_description%> -

+ <%= @poll.polls_description.nil? ? "" : @poll.polls_description.html_safe%>
    diff --git a/app/views/poll/show.html.erb b/app/views/poll/show.html.erb index ae2691a91..ad10a5468 100644 --- a/app/views/poll/show.html.erb +++ b/app/views/poll/show.html.erb @@ -33,9 +33,7 @@

    <%= @poll.polls_name%>

    -

    - <%= @poll.polls_description.html_safe %> -

    + <%= @poll.polls_description.nil? ? "" : @poll.polls_description.html_safe%>
diff --git a/app/views/projects/_invite_members_by_mail.html.erb b/app/views/projects/_invite_members_by_mail.html.erb index 1f6365664..42a36bce0 100644 --- a/app/views/projects/_invite_members_by_mail.html.erb +++ b/app/views/projects/_invite_members_by_mail.html.erb @@ -1,16 +1,22 @@ -
-

邀请加入

-
-
+

发送邮件邀请新用户

输入好友邮箱地址，Trustie帮您免费发送！

-

<%= form_tag('send_mail_to_member', :controller => 'projects',:action => 'send_mail_to_member', method: 'get',:remote=>true) do %>

+
+ <%= render :partial => 'regested', locals: { :isregisted => false} %> +
+ <%= form_tag('send_mail_to_member', :controller => 'projects',:action => 'send_mail_to_member', method: 'get',:remote=>true) do %> +
    +
  • <%= text_field_tag 'mail', '邮箱', :class => "fb_item fl" %> +
    • - <%= submit_tag '免费发送', :style=> "display:block; width:80px; text-align:center; color:#fff; height:26px; padding-top:3px; margin-bottom:10px;" %> + +
    +
+ <%= submit_tag '免费发送', :class=> "btn_free" %> <% end %>
diff --git a/app/views/projects/_regested.html.erb b/app/views/projects/_regested.html.erb new file mode 100644 index 000000000..97f418254 --- /dev/null +++ b/app/views/projects/_regested.html.erb @@ -0,0 +1,3 @@ +<% if isregisted %> +

<%= l(:notice_registed_success) %>

+<% end %> \ No newline at end of file diff --git a/app/views/projects/send_mail_to_member.js.erb b/app/views/projects/send_mail_to_member.js.erb new file mode 100644 index 000000000..21b097c65 --- /dev/null +++ b/app/views/projects/send_mail_to_member.js.erb @@ -0,0 +1 @@ +$("#is_registed").html("<%= escape_javascript( render :partial => 'regested', locals: {:isregisted => @is_zhuce})%>") \ No newline at end of file diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index b1a699afa..51139ac89 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -110,45 +110,7 @@
-
- -
- -
+