From b359d5d5668cab033e489cf1711d8c6dd3667641 Mon Sep 17 00:00:00 2001 From: Rueshyna Date: Mon, 19 Nov 2012 16:28:05 +0800 Subject: [PATCH] some bugs --- app/views/desktop/journal_pages/_form.html.erb | 5 ++--- app/views/desktop/journal_pages/new.html.erb | 2 +- .../personal_journal/app/models/writing_journal.rb | 3 +++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/views/desktop/journal_pages/_form.html.erb b/app/views/desktop/journal_pages/_form.html.erb index febb501da..a87f2d72a 100644 --- a/app/views/desktop/journal_pages/_form.html.erb +++ b/app/views/desktop/journal_pages/_form.html.erb @@ -138,7 +138,8 @@
  • <%= label_tag("", "Date of Publication", class: "s_grid_2 s_grid") %><%= f.text_field :publication_date, size: "20", value: "2012 / 05 / 01", class: "s_grid_4 s_grid"%> -
  • +
  • <%= f.text_field :keyword, size: "20", value: "Keywords", class: "s_grid_6 s_grid"%> @@ -151,8 +152,6 @@
  • <%= label_tag("", "Full Text", class: "s_grid_2 s_grid") %> -
  • -
  • <%= f.file_field :writing_journal_files, size: "20", class: "s_grid_4 s_grid"%>
  • diff --git a/app/views/desktop/journal_pages/new.html.erb b/app/views/desktop/journal_pages/new.html.erb index 58a4bf9a8..db2fb548e 100644 --- a/app/views/desktop/journal_pages/new.html.erb +++ b/app/views/desktop/journal_pages/new.html.erb @@ -1,3 +1,3 @@ -<%= form_for @writing_journal, html: { multipart: true } , url: desktop_journal_pages_path do |f| %> +<%= form_for @writing_journal, html: { multipart: true ,:type=>"ajax_form"} , url: desktop_journal_pages_path do |f| %> <%= render partial: 'desktop/journal_pages/form', locals: {:f => f} %> <%end%> diff --git a/vendor/built_in_modules/personal_journal/app/models/writing_journal.rb b/vendor/built_in_modules/personal_journal/app/models/writing_journal.rb index 873d26413..49dc00154 100644 --- a/vendor/built_in_modules/personal_journal/app/models/writing_journal.rb +++ b/vendor/built_in_modules/personal_journal/app/models/writing_journal.rb @@ -85,6 +85,9 @@ class WritingJournal title.join(', ') end + def new_writing_journal_files=(var) + self.writing_journal_files.new(:file=>var[0]) + end protected def add_http