This commit is contained in:
z9hang 2014-08-25 09:16:05 +08:00
commit ddc8da99e4
6 changed files with 14 additions and 12 deletions

View File

@ -90,7 +90,6 @@ class WordsController < ApplicationController
end
def destroyJournal
@journalP=JournalsForMessage.find(params[:object_id])
@journalP.destroy

View File

@ -211,6 +211,9 @@ module WatchersHelper
end
def watchers_checkboxes(object, users, checked=nil)
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
@ -219,6 +222,7 @@ module WatchersHelper
:class => "floating"
end.join.html_safe
end
end
def applied_css(project)
id = project.id

View File

@ -6,7 +6,7 @@
<p><%= link_to_attachment @attachment, :text => l(:button_download), :download => true -%>
<span class="size">(<%= number_to_human_size @attachment.filesize %>)</span>&nbsp&nbsp&nbsp
<span class="size">
<% 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,

View File

@ -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 %>
</span>

View File

@ -30,7 +30,6 @@
<% else %>
<%= l(:label_x_contribute_to, :count => 0) %>
<% end %>
</p>
<p class="font_description">
<% unless user.memberships.empty? %>
@ -47,7 +46,6 @@
</td>
</tr>
<!-- end -->
<tr>
<td width="200" align="right" class="font_lighter"><%= l(:label_user_joinin) %><%= format_date(user.created_on) %>
</td>

View File

@ -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'