From e244493b55a75122eeb9bc15ffa17292154b7d4c Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 28 Jan 2013 16:19:36 +0800 Subject: [PATCH] member plugin edit --- .../back_end/page_contexts_controller.rb | 6 ++- .../back_end/page_contexts/_form.html.erb | 1 + .../page_contexts/_page_context.html.erb | 2 +- .../front_end/writing_books_controller.rb | 30 +++++++++++++++ .../app/models/book_paper_type.rb | 4 -- .../writing_books/_paper_type_qe.html.erb | 2 +- .../back_end/writing_books/index.html.erb | 1 + .../front_end/writing_books/index.html.erb | 27 +++++++++++++ .../front_end/writing_books/show.html.erb | 37 ++++++++++++++++++ .../front_end/honors_controller.rb | 28 ++++++++++++++ .../front_end/honors/index.html.erb | 27 +++++++++++++ .../front_end/honors/show.html.erb | 15 ++++++++ .../front_end/writing_journals_controller.rb | 31 +++++++++++++++ .../back_end/writing_journals/index.html.erb | 1 + .../front_end/writing_journals/index.html.erb | 27 +++++++++++++ .../front_end/writing_journals/show.html.erb | 38 +++++++++++++++++++ .../front_end/writing_patents_controller.rb | 29 ++++++++++++++ .../back_end/writing_patents/index.html.erb | 1 + .../front_end/writing_patents/index.html.erb | 27 +++++++++++++ .../front_end/writing_patents/show.html.erb | 31 +++++++++++++++ .../front_end/projects_controller.rb | 28 ++++++++++++++ .../front_end/projects/index.html.erb | 27 +++++++++++++ .../front_end/projects/show.html.erb | 34 +++++++++++++++++ .../front_end/researchs_controller.rb | 27 +++++++++++++ .../front_end/researchs/index.html.erb | 27 +++++++++++++ .../front_end/researchs/show.html.erb | 29 ++++++++++++++ .../front_end/writing_seminars_controller.rb | 31 +++++++++++++++ .../front_end/writing_seminars/index.html.erb | 26 +++++++++++++ .../front_end/writing_seminars/show.html.erb | 36 ++++++++++++++++++ 29 files changed, 623 insertions(+), 7 deletions(-) create mode 100644 vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/front_end/writing_books_controller.rb create mode 100644 vendor/built_in_modules/personal_book/app/views/panel/personal_book/front_end/writing_books/index.html.erb create mode 100644 vendor/built_in_modules/personal_book/app/views/panel/personal_book/front_end/writing_books/show.html.erb create mode 100644 vendor/built_in_modules/personal_honor/app/controllers/panel/personal_honor/front_end/honors_controller.rb create mode 100644 vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/front_end/honors/index.html.erb create mode 100644 vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/front_end/honors/show.html.erb create mode 100644 vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/front_end/writing_journals_controller.rb create mode 100644 vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/front_end/writing_journals/index.html.erb create mode 100644 vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/front_end/writing_journals/show.html.erb create mode 100644 vendor/built_in_modules/personal_patent/app/controllers/panel/personal_patent/front_end/writing_patents_controller.rb create mode 100644 vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/front_end/writing_patents/index.html.erb create mode 100644 vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/front_end/writing_patents/show.html.erb create mode 100644 vendor/built_in_modules/personal_project/app/controllers/panel/personal_project/front_end/projects_controller.rb create mode 100644 vendor/built_in_modules/personal_project/app/views/panel/personal_project/front_end/projects/index.html.erb create mode 100644 vendor/built_in_modules/personal_project/app/views/panel/personal_project/front_end/projects/show.html.erb create mode 100644 vendor/built_in_modules/personal_research/app/controllers/panel/personal_research/front_end/researchs_controller.rb create mode 100644 vendor/built_in_modules/personal_research/app/views/panel/personal_research/front_end/researchs/index.html.erb create mode 100644 vendor/built_in_modules/personal_research/app/views/panel/personal_research/front_end/researchs/show.html.erb create mode 100644 vendor/built_in_modules/personal_seminar/app/controllers/panel/personal_seminar/front_end/writing_seminars_controller.rb create mode 100644 vendor/built_in_modules/personal_seminar/app/views/panel/personal_seminar/front_end/writing_seminars/index.html.erb create mode 100644 vendor/built_in_modules/personal_seminar/app/views/panel/personal_seminar/front_end/writing_seminars/show.html.erb 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 facbebb4..53822782 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 f10615f3..726c34e4 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 @@
+ <%= hidden_field_tag 'page', params[:page] if !params[:page].blank? %> <%= f.submit t('submit'), :class=>'btn btn-primary' %> <%= link_to t('cancel'), get_go_back, :class=>"btn" %>
diff --git a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_page_context.html.erb b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_page_context.html.erb index ea526a79..1b4c3d90 100644 --- a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_page_context.html.erb +++ b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_page_context.html.erb @@ -5,7 +5,7 @@