summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2012-07-18 18:01:14 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2012-07-18 18:01:14 +0000
commitc9a46950de1bbcd7e4b326dcc619ffacd4cac713 (patch)
tree35c3622b331369d07bd59f99383d26cacade1fbf
parentff68fff80ed1cc9f95587581be9eb641d7a776e5 (diff)
downloadredmine-c9a46950de1bbcd7e4b326dcc619ffacd4cac713.tar.gz
redmine-c9a46950de1bbcd7e4b326dcc619ffacd4cac713.zip
Removes calls to link_to_remote.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10032 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/views/issues/new.html.erb7
-rw-r--r--app/views/issues/show.html.erb9
-rw-r--r--app/views/messages/show.html.erb19
3 files changed, 20 insertions, 15 deletions
diff --git a/app/views/issues/new.html.erb b/app/views/issues/new.html.erb
index fe07dbdd6..1db43d726 100644
--- a/app/views/issues/new.html.erb
+++ b/app/views/issues/new.html.erb
@@ -26,9 +26,10 @@
<%= watchers_checkboxes(@issue, @available_watchers) %>
</span>
<span class="search_for_watchers">
- <%= link_to_remote l(:label_search_for_watchers),
- :url => {:controller => 'watchers', :action => 'new', :project_id => @issue.project},
- :method => 'get' %>
+ <%= link_to l(:label_search_for_watchers),
+ {:controller => 'watchers', :action => 'new', :project_id => @issue.project},
+ :remote => true,
+ :method => 'get' %>
</span>
</p>
<% end %>
diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index 5601e0e3f..fa81e4645 100644
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -70,10 +70,11 @@ end %>
<hr />
<% if @issue.description? %>
<div class="contextual">
- <%= link_to_remote_if_authorized(
- l(:button_quote),
- { :url => {:controller => 'journals', :action => 'new', :id => @issue} },
- :class => 'icon icon-comment') %>
+ <%= link_to l(:button_quote),
+ {:controller => 'journals', :action => 'new', :id => @issue},
+ :remote => true,
+ :method => 'post',
+ :class => 'icon icon-comment' if authorize_for('issues', 'edit') %>
</div>
<p><strong><%=l(:field_description)%></strong></p>
diff --git a/app/views/messages/show.html.erb b/app/views/messages/show.html.erb
index 831d3ec14..36737b191 100644
--- a/app/views/messages/show.html.erb
+++ b/app/views/messages/show.html.erb
@@ -3,11 +3,13 @@
<div class="contextual">
<%= watcher_tag(@topic, User.current) %>
- <%= link_to_remote_if_authorized(
+ <%= link_to(
l(:button_quote),
- { :url => {:action => 'quote', :id => @topic} },
- :class => 'icon icon-comment'
- ) unless @topic.locked? %>
+ {:action => 'quote', :id => @topic},
+ :remote => true,
+ :method => 'get',
+ :class => 'icon icon-comment',
+ :remote => true) if !@topic.locked? && authorize_for('messages', 'reply') %>
<%= link_to(
l(:button_edit),
{:action => 'edit', :id => @topic},
@@ -38,11 +40,12 @@
<% @replies.each do |message| %>
<div class="message reply" id="<%= "message-#{message.id}" %>">
<div class="contextual">
- <%= link_to_remote_if_authorized(
+ <%= link_to(
image_tag('comment.png'),
- { :url => {:action => 'quote', :id => message} },
- :title => l(:button_quote)
- ) unless @topic.locked? %>
+ {:action => 'quote', :id => message},
+ :remote => true,
+ :method => 'get',
+ :title => l(:button_quote)) if !@topic.locked? && authorize_for('messages', 'reply') %>
<%= link_to(
image_tag('edit.png'),
{:action => 'edit', :id => message},