From c55f64f3c6e687e7d7713fe5fb55db9f19151101 Mon Sep 17 00:00:00 2001
From: Rueshyna <rueshyna(XD)gmail.com>
Date: Tue, 26 Feb 2013 15:17:09 +0800
Subject: [PATCH] correct view permission of conference

---
 .../personal_conference/desktop/conference_pages_controller.rb  | 2 +-
 .../personal_conference/desktop/conference_pages/_form.html.erb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/desktop/conference_pages_controller.rb b/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/desktop/conference_pages_controller.rb
index 8ca6ae69..2021e94e 100644
--- a/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/desktop/conference_pages_controller.rb
+++ b/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/desktop/conference_pages_controller.rb
@@ -1,7 +1,7 @@
 class Panel::PersonalConference::Desktop::ConferencePagesController < ApplicationController
   def index
     @view_by = params[:view]
-    @writing_conferences = WritingConference.all
+    @writing_conferences = WritingConference.where(create_user_id: current_user.id)
 
     if @view_by.nil?
       @writing_conferences = @writing_conferences.asc(:paper_title)
diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form.html.erb
index 8c5eb261..576ea462 100644
--- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form.html.erb
+++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form.html.erb
@@ -146,7 +146,7 @@
            <%= select_year((@writing_conference.year ? @writing_conference.year.to_i : DateTime.now.year), {:start_year => DateTime.now.year, :end_year => 1930}, {:name => 'writing_conference[year]', :class => "s_grid_4 s_grid"} ) %>
            </li>
 
-           <li class="s_grid_row"><input class="s_grid s_grid_6" type="text" placeholder=<%= t("tags") %>><span class="icon-plus input_append"></li>
+           <li class="s_grid_row"><input class="s_grid s_grid_6" type="text" placeholder=<%= t("personal_conference.tags") %>><span class="icon-plus input_append"></li>
 
            <li class="s_grid_row">
             <%= f.text_area :abstract, size: "20x22", placeholder: t("personal_conference.abstract"), class: "s_grid_6 s_grid full_height"%>