- <%= l(:label_date_from_to, :start => format_date(@date_from), :end => format_date(@date_to - 1)) %> + <%#= l(:label_date_from_to, :start => format_date(@date_from), :end => format_date(@date_to - 1)) %>
<% @events_by_day.keys.sort.reverse.each do |day| %> From 4c57136a1d757102fac873beb442d6dcd8674dfc Mon Sep 17 00:00:00 2001 From: linhk <304431313@.com> Date: Wed, 20 Aug 2014 10:50:29 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=95=99=E8=A8=80?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/projects_controller.rb | 2 ++ app/controllers/words_controller.rb | 10 +++++++++- app/views/projects/feedback.html.erb | 17 ++++++++++++----- app/views/words/destroyJournal.js.erb | 3 +++ config/routes.rb | 2 ++ 5 files changed, 28 insertions(+), 6 deletions(-) create mode 100644 app/views/words/destroyJournal.js.erb diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index ccbff8e50..ea37766b6 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -418,6 +418,8 @@ class ProjectsController < ApplicationController @jour = @jours[@offset, @limit] @state = false @base_courses_tag = @project.project_type + + respond_to do |format| format.html{render :layout => 'base_courses' if @base_courses_tag==1} format.api diff --git a/app/controllers/words_controller.rb b/app/controllers/words_controller.rb index 110f81537..af850d626 100644 --- a/app/controllers/words_controller.rb +++ b/app/controllers/words_controller.rb @@ -88,7 +88,15 @@ class WordsController < ApplicationController #format.api { render_api_ok } end end - + + def destroyJournal + @journalP=JournalsForMessage.find(params[:object_id]) + @journalP.destroy + respond_to do |format| + format.js + end + end + def new @jour = JournalsForMessage.find(params[:journal_id]) if params[:journal_id] if @jour diff --git a/app/views/projects/feedback.html.erb b/app/views/projects/feedback.html.erb index 5de3ceb4a..13e123b35 100644 --- a/app/views/projects/feedback.html.erb +++ b/app/views/projects/feedback.html.erb @@ -72,13 +72,20 @@ function checkMaxLength() { <% if reply_allow %> <%= link_to l(:label_projects_feedback_respond),'#', - {:focus => 'project_respond', - :onclick => "toggleAndSettingWordsVal($('##{id}'), - $('##{id} textarea'), - '#{l(:label_reply_plural)} #{journal.user.name}: '); + {:focus => 'project_respond', + :onclick => "toggleAndSettingWordsVal($('##{id}'), + $('##{id} textarea'), + '#{l(:label_reply_plural)} #{journal.user.name}: '); return false;"} %> <% end %> - + + <% if User.current.logged? %> + <% if journal.user_id==User.current.id|| User.current.admin? %> + <%= link_to(l(:button_delete),{:controller => 'words', :action => 'destroyJournal', :object_id => journal.id}, + :remote => true, :title => l(:button_delete)) %> + <% end %> + <% end %> + <% if reply_allow %> diff --git a/app/views/words/destroyJournal.js.erb b/app/views/words/destroyJournal.js.erb new file mode 100644 index 000000000..5c91c6053 --- /dev/null +++ b/app/views/words/destroyJournal.js.erb @@ -0,0 +1,3 @@ +<% if @journalP!=nil %> + $(".message-for-user").children("#word_li_<%=@journalP.id%>").remove(); +<% end %> \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 9d9b9d13b..f93318c7d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -652,6 +652,7 @@ RedmineApp::Application.routes.draw do delete 'words/destroy', :to => 'words#destroy' get 'words/more', :to => 'words#more' get 'words/back', :to=> 'words#back' + get 'words/destroyJournal', :to => 'words#destroyJournal' ############## fq post 'calls/create', :to => 'bids#create' delete 'calls/destroy', :to => 'bids#destroy' @@ -746,6 +747,7 @@ RedmineApp::Application.routes.draw do match 'words/add_brief_introdution', :controller => 'words', :action => 'add_brief_introdution' + Dir.glob File.expand_path("plugins/*", Rails.root) do |plugin_dir| file = File.join(plugin_dir, "config/routes.rb") if File.exists?(file)