From 6c9e2a7249387c6b9c5ee5cd07bf53977c3c0621 Mon Sep 17 00:00:00 2001
From: Rueshyna <rueshyna(XD)gmail.com>
Date: Tue, 26 Feb 2013 16:57:08 +0800
Subject: [PATCH] fixed journal co author bug

---
 .../desktop/journal_co_author_relations/_form.html.erb        | 2 +-
 .../desktop/journal_co_author_relations/_show_form.html.erb   | 4 ++--
 .../desktop/journal_co_authors/index.html.erb                 | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/_form.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/_form.html.erb
index c6f9ef53..bffde52f 100644
--- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/_form.html.erb
+++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/_form.html.erb
@@ -1,4 +1,4 @@
-<%= f.text_field :journal_co_author_relation %>
+<%= f.text_field :relation %>
 <!--
 <#%= f.fields_for :journal_co_author_relation_translations do |f| %>
   <#%= f.text_field locale,
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 2ef640c4..e43c6f17 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
@@ -6,8 +6,8 @@
       <li class="s_grid_row">
       <div class="form_space" id="form_space_<%= i.to_s %>"><%= journal_co_author_relation.relation %></div>
       <div class="list_item_function">
-        <%= link_to 'Edit', edit_panel_personal_journal_desktop_journal_co_author_relation_path(co_author_relation), :class => "bt-edit-type admbg2 admtxt", "content-holder"=>"#form_space_"+i.to_s, "ajax-remote"=>"get" %>
-        <%= link_to 'Destroy', panel_personal_journal_desktop_journal_co_author_relation_path(co_author_relation), "confirm-message"=>'Are you sure?', "ajax-remote"=>"delete", :class=>"bt-delete admbg2 admtxt" %>
+        <%= link_to 'Edit', edit_panel_personal_journal_desktop_journal_co_author_relation_path(journal_co_author_relation), :class => "bt-edit-type admbg2 admtxt", "content-holder"=>"#form_space_"+i.to_s, "ajax-remote"=>"get" %>
+        <%= link_to 'Destroy', panel_personal_journal_desktop_journal_co_author_relation_path(journal_co_author_relation), "confirm-message"=>'Are you sure?', "ajax-remote"=>"delete", :class=>"bt-delete admbg2 admtxt" %>
       </div>
       </li>
       <% if ( i % 6 ) == 5 %>
diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_authors/index.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_authors/index.html.erb
index 7f0ec7e7..c6ac1843 100644
--- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_authors/index.html.erb
+++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_authors/index.html.erb
@@ -17,7 +17,7 @@
               <ul class="info">
                 <li><div class="name"><%= co_author.co_author %></div></li>
                 <li><div class="email"><i class="icon-envelope"></i> <%= co_author.email %></div></li>
-                <li><div class="relations"><i class="icon-user"></i> <%= @journal_co_author_relations.find(co_author.co_author_relations_id).relation unless co_author.co_author_relations_id.nil?%></div></li>
+                <li><div class="relations"><i class="icon-user"></i> <%= @journal_co_author_relations.find(co_author.journal_co_author_relations_id).relation unless co_author.journal_co_author_relations_id.nil?%></div></li>
               </ul>
               <div class="list_item_function">
                 <%= link_to 'Edit', edit_panel_personal_journal_desktop_journal_co_author_path(co_author), :class => "bt-edit admbg2 admtxt", "ajax-remote"=>"get" %>