From 5b85aa09619e79ebb2d2bb1dbd4e0d7466895806 Mon Sep 17 00:00:00 2001 From: zhanghaitao <562681745@qq.com> Date: Sat, 23 Aug 2014 14:42:58 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E9=99=90=E5=88=B6=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E6=8E=A7=E4=BB=B6=E7=9A=84=E4=B8=8D=E5=8F=AF=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E6=80=A7=EF=BC=8C=E8=A7=A3=E5=86=B3=E8=BE=93=E5=85=A5=E4=B8=8D?= =?UTF-8?q?=E6=AD=A3=E7=A1=AE=E6=97=A5=E6=9C=9F=E8=BF=94=E5=9B=9E=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/application_helper.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 1f6091f12..fc12640e9 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1343,7 +1343,7 @@ module ApplicationHelper start_of_week = start_of_week.to_i % 7 tags = javascript_tag( - "var datepickerOptions={dateFormat: 'yy-mm-dd', firstDay: #{start_of_week}, " + + "var datepickerOptions={dateFormat: 'yy-mm-dd',EditText:false, firstDay: #{start_of_week}, " + "showOn: 'button', buttonImageOnly: true, buttonImage: '" + path_to_image('/images/calendar.png') + "', showButtonPanel: true, showWeek: true, showOtherMonths: true, selectOtherMonths: true};") @@ -1365,7 +1365,7 @@ module ApplicationHelper start_of_week = start_of_week.to_i % 7 tags = javascript_tag( - "var datepickerOptions={dateFormat: 'yy-mm-dd',minDate: new Date(), firstDay: #{start_of_week}, " + + "var datepickerOptions={dateFormat: 'yy-mm-dd',minDate: new Date(),EditText:false, firstDay: #{start_of_week}, " + "showOn: 'button', buttonImageOnly: true, buttonImage: '" + path_to_image('/images/calendar.png') + "', showButtonPanel: true, showWeek: true, showOtherMonths: true, selectOtherMonths: true, onClose: function(dateText, inst) {TimeClose(dateText,inst);}, beforeShow : function(input){TimeBeforeShow(input);} };") From b1048074ef1058cea895c3d322f0e46ab423f6e0 Mon Sep 17 00:00:00 2001 From: zhanghaitao <562681745@qq.com> Date: Sat, 23 Aug 2014 15:19:12 +0800 Subject: [PATCH 2/6] =?UTF-8?q?#1072=20=E5=8F=91=E5=B8=83=E4=BD=9C?= =?UTF-8?q?=E4=B8=9A=EF=BC=9A=E6=88=AA=E6=AD=A2=E6=97=A5=E6=9C=9F=E4=B8=8D?= =?UTF-8?q?=E8=83=BD=E6=89=8B=E5=8A=A8=E8=BE=93=E5=85=A5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/application_helper.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index fc12640e9..1f6091f12 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1343,7 +1343,7 @@ module ApplicationHelper start_of_week = start_of_week.to_i % 7 tags = javascript_tag( - "var datepickerOptions={dateFormat: 'yy-mm-dd',EditText:false, firstDay: #{start_of_week}, " + + "var datepickerOptions={dateFormat: 'yy-mm-dd', firstDay: #{start_of_week}, " + "showOn: 'button', buttonImageOnly: true, buttonImage: '" + path_to_image('/images/calendar.png') + "', showButtonPanel: true, showWeek: true, showOtherMonths: true, selectOtherMonths: true};") @@ -1365,7 +1365,7 @@ module ApplicationHelper start_of_week = start_of_week.to_i % 7 tags = javascript_tag( - "var datepickerOptions={dateFormat: 'yy-mm-dd',minDate: new Date(),EditText:false, firstDay: #{start_of_week}, " + + "var datepickerOptions={dateFormat: 'yy-mm-dd',minDate: new Date(), firstDay: #{start_of_week}, " + "showOn: 'button', buttonImageOnly: true, buttonImage: '" + path_to_image('/images/calendar.png') + "', showButtonPanel: true, showWeek: true, showOtherMonths: true, selectOtherMonths: true, onClose: function(dateText, inst) {TimeClose(dateText,inst);}, beforeShow : function(input){TimeBeforeShow(input);} };") From 4d583b08c79bbd4f34932dd76b5f97d69c4a0317 Mon Sep 17 00:00:00 2001 From: linhk <304431313@.com> Date: Sat, 23 Aug 2014 15:33:39 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E2=80=98=E6=96=B0=E5=A2=9E=E8=AF=84?= =?UTF-8?q?=E5=AE=A1=E2=80=99=E6=8C=89=E9=92=AE=E6=98=BE=E7=A4=BA=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=9D=83=E9=99=90=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/attachments/file.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/attachments/file.html.erb b/app/views/attachments/file.html.erb index 37db6f2bc..186b85c69 100644 --- a/app/views/attachments/file.html.erb +++ b/app/views/attachments/file.html.erb @@ -6,7 +6,7 @@

<%= link_to_attachment @attachment, :text => l(:button_download), :download => true -%> (<%= number_to_human_size @attachment.filesize %>)    - <% if @attachment!=nil&&@attachment.container_type == 'Document' %> + <% if @attachment!=nil&&@attachment.container_type == 'Document'&&User.current.allowed_to?({:controller => 'code_review', :action => 'update_diff_view'}, @attachment.project) %> <%= link = link_to(l(:button_add), {:controller => 'code_review', :action => 'assign', :action_type => 'attachment', :id=>@attachment.project, From 0e8498220386189fd5d49dc080ea279e3cbdba2e Mon Sep 17 00:00:00 2001 From: zhanghaitao <562681745@qq.com> Date: Sat, 23 Aug 2014 15:47:42 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=BC=80=E5=A7=8B=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E3=80=81=E8=AE=A1=E5=88=92=E5=AE=8C=E6=88=90=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E4=B8=8D=E5=90=88=E6=B3=95=E5=B7=B2=E5=8F=91=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/watchers_helper.rb | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/app/helpers/watchers_helper.rb b/app/helpers/watchers_helper.rb index be5609d7c..b05e0b286 100644 --- a/app/helpers/watchers_helper.rb +++ b/app/helpers/watchers_helper.rb @@ -211,13 +211,17 @@ module WatchersHelper end def watchers_checkboxes(object, users, checked=nil) - users.map do |user| - c = checked.nil? ? object.watched_by?(user) : checked - tag = check_box_tag 'issue[watcher_user_ids][]', user.id, c, :id => nil - content_tag 'label', "#{tag} #{h(user)}".html_safe, - :id => "issue_watcher_user_ids_#{user.id}", - :class => "floating" - end.join.html_safe + if users.nil? + + else + users.map do |user| + c = checked.nil? ? object.watched_by?(user) : checked + tag = check_box_tag 'issue[watcher_user_ids][]', user.id, c, :id => nil + content_tag 'label', "#{tag} #{h(user)}".html_safe, + :id => "issue_watcher_user_ids_#{user.id}", + :class => "floating" + end.join.html_safe + end end def applied_css(project) From 87f8e90f258d55066b8e7455af3389d0dccd66c9 Mon Sep 17 00:00:00 2001 From: chenmin <19763783@qq.com> Date: Sat, 23 Aug 2014 16:11:03 +0800 Subject: [PATCH 5/6] =?UTF-8?q?1=E3=80=81=E5=A4=9A=E4=BD=99=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/user_fanslist.html.erb | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/views/users/user_fanslist.html.erb b/app/views/users/user_fanslist.html.erb index f9e4341bf..984cdf352 100644 --- a/app/views/users/user_fanslist.html.erb +++ b/app/views/users/user_fanslist.html.erb @@ -30,7 +30,6 @@ <% else %> <%= l(:label_x_contribute_to, :count => 0) %> <% end %> -

<% unless user.memberships.empty? %> @@ -47,7 +46,6 @@ - <%= l(:label_user_joinin) %><%= format_date(user.created_on) %> From 9f3392eba88d8435dfd2939d94414430e8444807 Mon Sep 17 00:00:00 2001 From: linhk <304431313@.com> Date: Sat, 23 Aug 2014 16:41:07 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=BB=E7=95=99?= =?UTF-8?q?=E8=A8=80=E6=97=B6=E7=A1=AE=E8=AE=A4=E5=88=A0=E9=99=A4=E7=9A=84?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/words_controller.rb | 1 - app/views/projects/feedback.html.erb | 2 +- config/routes.rb | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/words_controller.rb b/app/controllers/words_controller.rb index 2d03b2112..f2502e03e 100644 --- a/app/controllers/words_controller.rb +++ b/app/controllers/words_controller.rb @@ -90,7 +90,6 @@ class WordsController < ApplicationController end def destroyJournal - @journalP=JournalsForMessage.find(params[:object_id]) @journalP.destroy diff --git a/app/views/projects/feedback.html.erb b/app/views/projects/feedback.html.erb index 8e36b8c59..f9182c544 100644 --- a/app/views/projects/feedback.html.erb +++ b/app/views/projects/feedback.html.erb @@ -85,7 +85,7 @@ function checkMaxLength() { <% 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, :project_id=>@project.id, :page=>@page}, - :remote => true, :title => l(:button_delete)) %> + :remote => true, :title => l(:button_delete), :confirm => l(:text_are_you_sure), :method => 'delete', :class => "delete") %> <% end %> <% end %> diff --git a/config/routes.rb b/config/routes.rb index ed9001ee2..33b5cd16a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -652,6 +652,7 @@ RedmineApp::Application.routes.draw do post 'words/append', :to => 'words#append' post 'words/create_reply', :to => 'words#create_reply' delete 'words/destroy', :to => 'words#destroy' + delete 'words/destroyJournal', :to => 'words#destroyJournal' get 'words/more', :to => 'words#more' get 'words/back', :to=> 'words#back' get 'words/destroyJournal', :to => 'words#destroyJournal'