From adea37116164c45e7d1fbe84f9abffb41038382b Mon Sep 17 00:00:00 2001
From: Saurabh Bhatia <saurabh.a.bhatia@gmail.com>
Date: Thu, 10 Jul 2014 14:52:06 +0800
Subject: [PATCH] fix deletes in journal paper

---
 app/controllers/admin/journal_papers_controller.rb | 7 ++++++-
 app/controllers/journal_papers_controller.rb       | 2 +-
 app/models/journal_paper.rb                        | 2 +-
 app/models/journal_paper_file.rb                   | 2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/controllers/admin/journal_papers_controller.rb b/app/controllers/admin/journal_papers_controller.rb
index 253b592..4c299ad 100644
--- a/app/controllers/admin/journal_papers_controller.rb
+++ b/app/controllers/admin/journal_papers_controller.rb
@@ -2,9 +2,10 @@ class Admin::JournalPapersController < OrbitMemberController
   include Admin::JournalPapersHelper
   layout "member_plugin"
 
-  before_action :set_journal_paper, only: [:show, :edit , :update, :destroy]
+  before_action :set_journal_paper, only: [:show, :edit , :update]
   before_action :get_plugins, only: [:index, :writing_journal_setting, :new, :create, :edit, :update]
   before_action :set_types, only: [:writing_journal_setting, :new, :edit, :create, :update]
+  before_action :find_journal_paper, only: [:destroy]
 
   def index
     @writing_journals = JournalPaper.all
@@ -179,6 +180,10 @@ class Admin::JournalPapersController < OrbitMemberController
   	@journal_paper = JournalPaper.find_by(uid: uid)
   end
 
+  def find_journal_paper
+    @journal_paper = JournalPaper.find_by(id: params[:id])
+  end
+
   def journal_paper_attributes
   	params.require(:journal_paper).permit! rescue nil
   end
diff --git a/app/controllers/journal_papers_controller.rb b/app/controllers/journal_papers_controller.rb
index 3f49e5d..788b092 100644
--- a/app/controllers/journal_papers_controller.rb
+++ b/app/controllers/journal_papers_controller.rb
@@ -30,7 +30,7 @@ class JournalPapersController < ApplicationController
   			"issue_no" => journal_paper.issue_no,
   			"form_to_start" => journal_paper.form_to_start,
   			"form_to_end" => journal_paper.form_to_end,
-  			"language" => t(journal_paper.language),
+  			"language" => journal_paper.language,
   			"total_pages" => journal_paper.total_pages,
   			"keywords" => journal_paper.keywords,
   			"abstract" => journal_paper.abstract,
diff --git a/app/models/journal_paper.rb b/app/models/journal_paper.rb
index 43ed5eb..bc7f981 100644
--- a/app/models/journal_paper.rb
+++ b/app/models/journal_paper.rb
@@ -33,7 +33,7 @@ class JournalPaper
   has_many :journal_paper_files, autosave: true, dependent: :destroy
   accepts_nested_attributes_for :journal_paper_files
 
-  has_and_belongs_to_many :journal_paper_authors
+  has_and_belongs_to_many :journal_paper_authors, dependent: :destroy
   accepts_nested_attributes_for :journal_paper_authors
 
   has_and_belongs_to_many :journal_paper_author_types
diff --git a/app/models/journal_paper_file.rb b/app/models/journal_paper_file.rb
index 36af09c..198d1c7 100644
--- a/app/models/journal_paper_file.rb
+++ b/app/models/journal_paper_file.rb
@@ -8,5 +8,5 @@ class JournalPaperFile
   field :should_destroy, type: Boolean
 
   mount_uploader :journal_file, AssetUploader
-  belongs_to :journal_paper
+  belongs_to :journal_paper, dependent: :destroy
 end