From 228dd1b767a1045fa78de5e96e43b25ae26f0732 Mon Sep 17 00:00:00 2001
From: Rueshyna <rueshyna(XD)gmail.com>
Date: Thu, 14 Mar 2013 18:29:24 +0800
Subject: [PATCH] fixed co author relation save button

---
 .../desktop/conference_co_author_relations_controller.rb       | 1 -
 .../desktop/conference_co_author_relations/_show_form.html.erb | 2 ++
 .../desktop/conference_co_author_relations/index.html.erb      | 2 --
 .../javascripts/personal_journal/desktop/journal_pages.js      | 3 ++-
 .../desktop/journal_co_author_relations/_show_form.html.erb    | 2 ++
 .../desktop/journal_co_author_relations/index.html.erb         | 2 --
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/desktop/conference_co_author_relations_controller.rb b/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/desktop/conference_co_author_relations_controller.rb
index 696cc4900..62ad9fa7d 100644
--- a/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/desktop/conference_co_author_relations_controller.rb
+++ b/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/desktop/conference_co_author_relations_controller.rb
@@ -40,7 +40,6 @@ class Panel::PersonalConference::Desktop::ConferenceCoAuthorRelationsController
     if @conference_co_author_relation.update_attributes(params[:conference_co_author_relation])
       @conference_co_author_relations = ConferenceCoAuthorRelation.all
       newv = render_to_string partial: "show_form", object: @conference_co_author_relations
-      newv = '<div class="overview" content-layout="datalist" per-column="4" base-width="300">' + newv + '</div>'
       render json: {success: true, msg: t('update_success'), newvalue: newv}.to_json
     else
       error_msg = @conference_co_author.errors.full_messages.join("<br />")
diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/_show_form.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/_show_form.html.erb
index 07ca624b4..5d447a803 100644
--- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/_show_form.html.erb
+++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/_show_form.html.erb
@@ -1,3 +1,4 @@
+<div class="overview" content-layout="datalist" per-column="4" base-width="300" pagination-var="page">
 <ul>
   <% @conference_co_author_relations.each_with_index do |conference_co_author_relation,i| %>
     <li class="s_grid_row" item="true">
@@ -9,3 +10,4 @@
     </li>
   <% end %>
 </ul>
+</div>
diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/index.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/index.html.erb
index a44e052e4..58ec05fba 100644
--- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/index.html.erb
+++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/index.html.erb
@@ -15,9 +15,7 @@
 <!-- <div id="co_author_relation_table" class="tinycanvas vp">
   <div class="scrollbar sb_h vp"><div class="track"><div class="thumb thmc2"><div class="end"></div></div></div></div>
   <div class="viewport"> -->
-    <div class="overview" content-layout="datalist" per-column="4" base-width="300" pagination-var="page">
       <%= render :partial => 'show_form'%>
-    </div>
 <!--   </div>
 </div>
  -->
diff --git a/vendor/built_in_modules/personal_journal/app/assets/javascripts/personal_journal/desktop/journal_pages.js b/vendor/built_in_modules/personal_journal/app/assets/javascripts/personal_journal/desktop/journal_pages.js
index dd233c3df..776746275 100644
--- a/vendor/built_in_modules/personal_journal/app/assets/javascripts/personal_journal/desktop/journal_pages.js
+++ b/vendor/built_in_modules/personal_journal/app/assets/javascripts/personal_journal/desktop/journal_pages.js
@@ -211,7 +211,8 @@ orbitDesktop.prototype.initializeJournalPapers = function(target,url,cache){ //
   this.initializeJournalPapers.coauthorRelationEditForm = function(data){
     if(data.success){
       o.notify(data.msg,"success");
-      $("#co_author_relation_table").html(data.newvalue);
+      var x = o.layout_data.generate_layout_html(data.newvalue);
+      $("div[container=true] div.overview").html(x.markup);
     }else{
       o.notify(data.msg,"alert");
     }
diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/_show_form.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/_show_form.html.erb
index 8a7254cfe..6a580edbc 100644
--- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/_show_form.html.erb
+++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/_show_form.html.erb
@@ -1,3 +1,4 @@
+<div class="overview" content-layout="datalist" per-column="5" base-width="300" pagination-var="page">
 <ul>
   <% @journal_co_author_relations.each_with_index do |journal_co_author_relation,i| %>
     <li class="s_grid_row" item="true">
@@ -9,3 +10,4 @@
     </li>
   <% end %>
 </ul>
+</div>
diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/index.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/index.html.erb
index e277aa2dc..774914f48 100644
--- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/index.html.erb
+++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/index.html.erb
@@ -15,9 +15,7 @@
 <!-- <div id="co_author_relation_table" class="tinycanvas vp">
   <div class="scrollbar sb_h vp"><div class="track"><div class="thumb thmc2"><div class="end"></div></div></div></div>
   <div class="viewport"> -->
-    <div class="overview" content-layout="datalist" per-column="5" base-width="300" pagination-var="page">
       <%= render :partial => 'show_form'%>
-    </div>
 <!--   </div>
 </div>
  -->