From cf8ffa8fbc376ef7b72742192719b39a23f58c11 Mon Sep 17 00:00:00 2001 From: spen Date: Tue, 20 Jan 2015 14:43:31 +0800 Subject: [PATCH] add data can select member --- .../admin/writing_conferences_controller.rb | 48 ++++++++++++++++--- .../admin/writing_conferences/_form.html.erb | 15 +++++- .../admin/writing_conferences/index.html.erb | 1 + 3 files changed, 57 insertions(+), 7 deletions(-) diff --git a/app/controllers/admin/writing_conferences_controller.rb b/app/controllers/admin/writing_conferences_controller.rb index a777238..9d3d1d4 100644 --- a/app/controllers/admin/writing_conferences_controller.rb +++ b/app/controllers/admin/writing_conferences_controller.rb @@ -23,14 +23,50 @@ class Admin::WritingConferencesController < OrbitMemberController end def create - @member = MemberProfile.find(conference_params['member_profile_id']) rescue nil - @writing_conference = WritingConference.new(conference_params) - @writing_conference.save - if params[:desktop] == "true" - render json: {"data" => get_paper_list}.to_json - else + + if !conference_params['member_profile_id'].blank? + + @member = MemberProfile.find(conference_params['member_profile_id']) rescue nil + @writing_conference = WritingConference.new(conference_params) + @writing_conference.save + + if params[:desktop] == "true" + render json: {"data" => get_paper_list}.to_json + else + redirect_to params['referer_url'] + end + + elsif !params[:author_members].blank? + + params[:author_members].each do |author_member| + + conference_params['member_profile_id'] = author_member + @writing_conference = WritingConference.new(conference_params) + @writing_conference.save + + if params[:desktop] == "true" + render json: {"data" => get_paper_list}.to_json + end + + end + redirect_to params['referer_url'] + + else + + conference_params['member_profile_id'] = User.find(current_user.id).member_profile_id + + @writing_conference = WritingConference.new(conference_params) + @writing_conference.save + + if params[:desktop] == "true" + render json: {"data" => get_paper_list}.to_json + end + + redirect_to params['referer_url'] + end + end def edit diff --git a/app/views/admin/writing_conferences/_form.html.erb b/app/views/admin/writing_conferences/_form.html.erb index cc120c9..5c71ec5 100644 --- a/app/views/admin/writing_conferences/_form.html.erb +++ b/app/views/admin/writing_conferences/_form.html.erb @@ -135,14 +135,27 @@
+ <% if !@member.nil? %> +
<%= @member.name rescue ''%> - <%= f.hidden_field :member_profile_id, :value => @member.id if !@member.nil? %> + <%= f.hidden_field :member_profile_id, :value => @member.id %> +
+
+ + <% else %> + +
+ +
+ <%= render partial: 'admin/member_selects/email_selection_box', locals: {field: 'author_members[]', email_members:[]} %>
+ <% end %> +
diff --git a/app/views/admin/writing_conferences/index.html.erb b/app/views/admin/writing_conferences/index.html.erb index 79f9a35..65278f0 100644 --- a/app/views/admin/writing_conferences/index.html.erb +++ b/app/views/admin/writing_conferences/index.html.erb @@ -13,6 +13,7 @@
+ <%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t(:new_), new_admin_writing_conference_path, :class => 'btn btn-primary' %> <%= link_to content_tag(:i, nil, :class => 'icon-cog icon-white') + t('setting'), admin_writing_conference_setting_path, :class => 'btn btn-primary pull-right' %>