diff --git a/vendor/built_in_modules/page_content/app/controllers/panel/page_content/back_end/page_contexts_controller.rb b/vendor/built_in_modules/page_content/app/controllers/panel/page_content/back_end/page_contexts_controller.rb index facbebb42..538227825 100644 --- a/vendor/built_in_modules/page_content/app/controllers/panel/page_content/back_end/page_contexts_controller.rb +++ b/vendor/built_in_modules/page_content/app/controllers/panel/page_content/back_end/page_contexts_controller.rb @@ -96,7 +96,11 @@ class Panel::PageContent::BackEnd::PageContextsController < OrbitBackendControll @create_page_context.save end - format.html { redirect_to(panel_page_content_back_end_page_contexts_url, :notice => t('page_content.update_page_content_success')) } + if !params[:page].blank? + format.html { redirect_to(panel_page_content_back_end_page_contexts_url(:page =>params[:page]), :notice => t('page_content.update_page_content_success')) } + else + format.html { redirect_to(panel_page_content_back_end_page_contexts_url, :notice => t('page_content.update_page_content_success')) } + end format.js { render 'toggle_enable' } format.xml { head :ok } else diff --git a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb index f10615f33..726c34e49 100644 --- a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb +++ b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb @@ -37,6 +37,7 @@
<%= t(:year) %> | +<%= t(:title) %> | +
---|---|
<%= post.year %> | ++ <%= link_to post.create_link , panel_personal_book_front_end_writing_book_path(post) %> + | +
<%= t("writing_book.year")%> | <%= @writing_book.year %> |
---|---|
<%= t("writing_book.language")%> | <%= @writing_book.language %> |
<%= t("writing_book.paper_title")%> | <%= @writing_book.paper_title %> |
<%= t("writing_book.book_title")%> | <%= @writing_book.book_title %> |
<%= t("writing_book.book_paper_type")%> | <%= @writing_book.book_paper_type.title if !@writing_book.book_paper_type.blank? %> |
<%= t("writing_book.book_author_types")%> | <%= @book_author_types %> |
<%= t("writing_book.extracted_chapters")%> | <%= @writing_book.extracted_chapters %> |
<%= t("writing_book.publisher")%> | <%= @writing_book.publisher %> |
<%= t("writing_book.editor")%> | <%= @writing_book.editor %> |
<%= t("writing_book.publish_date")%> | <%= @writing_book.publish_date %> |
<%= t("writing_book.pages")%> | <%= @writing_book.pages %> |
<%= t("writing_book.isbn")%> | <%= @writing_book.isbn %> |
<%= t("writing_book.publication_date")%> | <%= @writing_book.publication_date %> |
<%= t("writing_book.url")%> | <%= link_to t(:url), @writing_book.url, {:target => '_blank', :title => @writing_book.book_title} if !@writing_book.url.blank? %> |
<%= t("writing_book.note")%> | <%= @writing_book.note %> |
<%= t("writing_book.authors")%> | <%= "#{User.from_id(@writing_book.create_user_id).name rescue ''},#{@writing_book.authors rescue ''}"%> |
<%= t("writing_book.files")%> | +
+<% if @writing_book.writing_book_files.size > 0 %>
+
+
+
+ <% end %>
+
+ <% @writing_book.writing_book_files.each do | wjfile | %>
+ <%= link_to wjfile.title, wjfile.file.url, {:target => '_blank', :title => wjfile.title} if wjfile.file.file %>
+ <% end %>
+
+ |
+
<%= t(:year) %> | +<%= t(:award_name) %> | +
---|---|
<%= post.year %> | ++ <%= link_to post.award_name , panel_personal_honor_front_end_honor_path(post) %> + | +
<%= t("honor.category")%> | <%= @honor.honor_category.title if @honor.honor_category %> |
---|---|
<%= t("honor.year")%> | <%= @honor.year %> |
<%= t("honor.language")%> | <%= @honor.language %> |
<%= t("honor.award_name")%> | <%= @honor.award_name %> |
<%= t("honor.awarding_unit")%> | <%= @honor.awarding_unit %> |
<%= t("honor.url")%> | <%= link_to t(:url), @honor.url, {:target => '_blank', :title => @honor.award_name} if !@honor.url.blank? %> |
<%= t("honor.note")%> | <%= @honor.note %> |
<%= t("honor.authors")%> | <%= User.from_id(@honor.create_user_id).name rescue '' %> |
<%= t(:year) %> | +<%= t(:title) %> | +
---|---|
<%= post.year %> | ++ <%= link_to post.create_link , panel_personal_journal_front_end_writing_journal_path(post) %> + | +
<%= t("writing_journal.year")%> | <%= @writing_journal.year %> |
---|---|
<%= t("writing_journal.language")%> | <%= @writing_journal.language %> |
<%= t("writing_journal.paper_title")%> | <%= @writing_journal.paper_title %> |
<%= t("writing_journal.journal_title")%> | <%= @writing_journal.journal_title %> |
<%= t("writing_journal.journal_paper_type")%> | <%= @writing_journal.journal_paper_type.title if @writing_journal.journal_paper_type %> |
<%= t("writing_journal.journal_level_types")%> | <%= @journal_level_types %> |
<%= t("writing_journal.journal_author_types")%> | <%= @journal_author_types %> |
<%= t("writing_journal.isbn")%> | <%= @writing_journal.isbn %> |
<%= t("writing_journal.vol_no")%> | <%= @writing_journal.vol_no %> |
<%= t("writing_journal.issue_no")%> | <%= @writing_journal.issue_no %> |
<%= t("writing_journal.form_to")%> | <%= "#{@writing_journal.form_to_start} ~ #{@writing_journal.form_to_end}" %> |
<%= t("writing_journal.total_pages")%> | <%= @writing_journal.total_pages %> |
<%= t("writing_journal.abstract")%> | <%= @writing_journal.abstract %> |
<%= t("writing_journal.publication_date")%> | <%= @writing_journal.publication_date %> |
<%= t("writing_journal.url")%> | <%= link_to t(:url), @writing_journal.url, {:target => '_blank', :title => @writing_journal.journal_title} if !@writing_journal.url.blank? %> |
<%= t("writing_journal.note")%> | <%= @writing_journal.note %> |
<%= t("writing_journal.authors")%> | <%= "#{User.from_id(@writing_journal.create_user_id).name rescue ''},#{@writing_journal.authors rescue ''}"%> |
<%= t("writing_journal.files")%> | +
+<% if @writing_journal.writing_journal_files.size > 0 %>
+
+
+
+ <% end %>
+
+ <% @writing_journal.writing_journal_files.each do | wjfile | %>
+ <%= link_to wjfile.title, wjfile.file.url, {:target => '_blank', :title => wjfile.title} if wjfile.file.file %>
+ <% end %>
+
+ |
+
<%= t(:year) %> | +<%= t(:title) %> | +
---|---|
<%= post.year %> | ++ <%= link_to post.patent_title , panel_personal_patent_front_end_writing_patent_path(post) %> + | +
<%= t("writing_patent.year")%> | <%= @writing_patent.year %> |
---|---|
<%= t("writing_patent.language")%> | <%= @writing_patent.language %> |
<%= t("writing_patent.patent_title")%> | <%= @writing_patent.patent_title %> |
<%= t("writing_patent.category")%> | <%= @writing_patent.writing_patent_category.title if @writing_patent.writing_patent_category %> |
<%= t("writing_patent.patent_no")%> | <%= @writing_patent.patent_no %> |
<%= t("writing_patent.patent_country")%> | <%= @writing_patent.patent_country %> |
<%= t("writing_patent.publish_date")%> | <%= @writing_patent.publish_date %> |
<%= t("writing_patent.url")%> | <%= link_to t(:url), @writing_patent.url, {:target => '_blank', :title => @writing_patent.patent_title} if !@writing_patent.url.blank? %> |
<%= t("writing_patent.note")%> | <%= @writing_patent.note %> |
<%= t("writing_patent.authors")%> | <%= "#{User.from_id(@writing_patent.create_user_id).name rescue ''},#{@writing_patent.authors rescue ''}"%> |
<%= t("writing_patent.files")%> | +
+<% if @writing_patent.writing_patent_files.size > 0 %>
+
+
+
+ <% end %>
+
+ <% @writing_patent.writing_patent_files.each do | wjfile | %>
+ <%= link_to wjfile.title, wjfile.file.url, {:target => '_blank', :title => wjfile.title} if wjfile.file.file %>
+ <% end %>
+
+ |
+
<%= t(:year) %> | +<%= t(:title) %> | +
---|---|
<%= post.year %> | ++ <%= link_to post.project_title , panel_personal_project_front_end_project_path(post) %> + | +
<%= t("project.year")%> | <%= @project.year %> |
---|---|
<%= t("project.language")%> | <%= @project.language %> |
<%= t("project.project_title")%> | <%= @project.project_title %> |
<%= t("project.job_title")%> | <%= @project.job_title %> |
<%= t("project.category")%> | <%= @project.project_category.title if @project.project_category %> |
<%= t("project.participator")%> | <%= @project.participator %> |
<%= t("project.unit")%> | <%= @project.unit %> |
<%= t("project.abstract")%> | <%= @project.abstract %> |
<%= t("project.period_start_date")%> | <%= @project.period_start_date %> |
<%= t("project.period_end_date")%> | <%= @project.period_end_date %> |
<%= t("project.url")%> | <%= link_to t(:url), @project.url, {:target => '_blank', :title => @project.title} if !@project.url.blank? %> |
<%= t("project.note")%> | <%= @project.note %> |
<%= t("project.authors")%> | <%= "#{User.from_id(@project.create_user_id).name rescue ''},#{@project.authors rescue ''}"%> |
<%= t("project.files")%> | +
+<% if @project.project_files.size > 0 %>
+
+
+
+ <% end %>
+
+ <% @project.project_files.each do | wjfile | %>
+ <%= link_to wjfile.title, wjfile.file.url, {:target => '_blank', :title => wjfile.title} if wjfile.file.file %>
+ <% end %>
+
+ |
+
<%= t(:year) %> | +<%= t(:title) %> | +
---|---|
<%= post.year %> | ++ <%= link_to post.research_title , panel_personal_research_front_end_research_path(post) %> + | +
<%= t("research.year")%> | <%= @research.year %> |
---|---|
<%= t("research.language")%> | <%= @research.language %> |
<%= t("research.research_title")%> | <%= @research.research_title %> |
<%= t("research.extracted_chapters")%> | <%= @research.extracted_chapters %> |
<%= t("research.publish_date")%> | <%= @research.publish_date %> |
<%= t("research.url")%> | <%= link_to t(:url), @research.url, {:target => '_blank', :title => @research.journal_title} if !@research.url.blank? %> |
<%= t("research.note")%> | <%= @research.note %> |
<%= t("research.authors")%> | <%= "#{User.from_id(@research.create_user_id).name rescue ''},#{@research.authors rescue ''}"%> |
<%= t("research.files")%> | +
+<% if @research.research_files.size > 0 %>
+
+
+
+ <% end %>
+
+ <% @research.research_files.each do | wjfile | %>
+ <%= link_to wjfile.title, wjfile.file.url, {:target => '_blank', :title => wjfile.title} if wjfile.file.file %>
+ <% end %>
+
+ |
+
<%= t(:year) %> | +<%= t(:title) %> | +
---|---|
<%= post.year %> | ++ <%= link_to post.create_link , panel_personal_seminar_front_end_writing_seminar_path(post) %> + | +
<%= t("writing_seminar.year")%> | <%= @writing_seminar.year %> |
---|---|
<%= t("writing_seminar.language")%> | <%= @writing_seminar.language %> |
<%= t("writing_seminar.paper_title")%> | <%= @writing_seminar.paper_title %> |
<%= t("writing_seminar.seminar_title")%> | <%= @writing_seminar.seminar_title %> |
<%= t("writing_seminar.seminar_paper_types")%> | <%= @seminar_paper_types %> |
<%= t("writing_seminar.seminar_author_types")%> | <%= @seminar_author_types %> |
<%= t("writing_seminar.location")%> | <%= @writing_seminar.location %> |
<%= t("writing_seminar.sponsor")%> | <%= @writing_seminar.sponsor %> |
<%= t("writing_seminar.period_start_date")%> | <%= @writing_seminar.period_start_date %> |
<%= t("writing_seminar.period_end_date")%> | <%= @writing_seminar.period_end_date %> |
<%= t("writing_seminar.abstract")%> | <%= @writing_seminar.abstract %> |
<%= t("writing_seminar.publication_date")%> | <%= @writing_seminar.publication_date %> |
<%= t("writing_seminar.url")%> | <%= link_to t(:url), @writing_seminar.url, {:target => '_blank', :title => @writing_seminar.seminar_title} if !@writing_seminar.url.blank? %> |
<%= t("writing_seminar.note")%> | <%= @writing_seminar.note %> |
<%= t("writing_seminar.authors")%> | <%= "#{User.from_id(@writing_seminar.create_user_id).name rescue ''},#{@writing_seminar.authors rescue ''}"%> |
<%= t("writing_seminar.files")%> | +
+<% if @writing_seminar.writing_seminar_files.size > 0 %>
+
+
+
+ <% end %>
+
+ <% @writing_seminar.writing_seminar_files.each do | wsfile | %>
+ <%= link_to wsfile.title, wsfile.file.url, {:target => '_blank', :title => wsfile.title} if wsfile.file.file %>
+ <% end %>
+
+ |
+