jro_apps/redmine Commit - r9849:c9a46950de1b

Removes calls to link_to_remote....

Jean-Philippe Lang -

r9849:c9a46950de1b

parent child

Context file:

r9849:c9a46950de1b

Collapse all files

app/views/issues/new.html.erb +4 -3

             <h2><%=l(:label_issue_new)%></h2>
             <%= call_hook(:view_issues_new_top, {:issue => @issue}) %>
             <%= labelled_form_for @issue, :url => project_issues_path(@project),
                                          :html => {:id => 'issue-form', :multipart => true} do |f| %>
               <%= error_messages_for 'issue' %>
               <%= hidden_field_tag 'copy_from', params[:copy_from] if params[:copy_from] %>
               <div class="box tabular">
                 <div id="all_attributes">
                 <%= render :partial => 'issues/form', :locals => {:f => f} %>
                 </div>
                 <% if @copy_from && @copy_from.attachments.any? %>
                 <p>
                   <label for="copy_attachments"><%= l(:label_copy_attachments) %></label>
                   <%= check_box_tag 'copy_attachments', '1', @copy_attachments %>
                 </p>
                 <% end %>
                 <p id="attachments_form"><%= label_tag('attachments[1][file]', l(:label_attachment_plural))%><%= render :partial => 'attachments/form', :locals => {:container => @issue} %></p>
                 <% if @issue.safe_attribute? 'watcher_user_ids' -%>
                   <p id="watchers_form"><label><%= l(:label_issue_watchers) %></label>
                   <span id="watchers_inputs">
                     <%= watchers_checkboxes(@issue, @available_watchers) %>
                   </span>
                   <span class="search_for_watchers">
-                  <%= link_to_remote l(:label_search_for_watchers),
+                  <%= link_to l(:label_search_for_watchers),
-                               :url => {:controller => 'watchers', :action => 'new', :project_id => @issue.project},
+                              {:controller => 'watchers', :action => 'new', :project_id => @issue.project},
-                               :method => 'get' %>
+                              :remote => true,
+                              :method => 'get' %>
                   </span>
                   </p>
                 <% end %>
               </div>
               <%= submit_tag l(:button_create) %>
               <%= submit_tag l(:button_create_and_continue), :name => 'continue' %>
               <%= preview_link preview_new_issue_path(:project_id => @project), 'issue-form' %>
               <%= javascript_tag "Form.Element.focus('issue_subject');" %>
             <% end %>
             <div id="preview" class="wiki"></div>
             <% content_for :header_tags do %>
                 <%= stylesheet_link_tag 'scm' %>
                 <%= robot_exclusion_tag %>
             <% end %>

app/views/issues/show.html.erb +5 -4

             <%= render :partial => 'action_menu' %>
             <h2><%= issue_heading(@issue) %></h2>
             <div class="<%= @issue.css_classes %> details">
               <% if @prev_issue_id || @next_issue_id %>
                 <div class="next-prev-links contextual">
                   <%= link_to_if @prev_issue_id,
                                  "\xc2\xab #{l(:label_previous)}",
                                  (@prev_issue_id ? issue_path(@prev_issue_id) : nil),
                                  :title => "##{@prev_issue_id}" %> |
                   <% if @issue_position && @issue_count %>
                     <span class="position"><%= l(:label_item_position, :position => @issue_position, :count => @issue_count) %></span> |
                   <% end %>
                   <%= link_to_if @next_issue_id,
                                  "#{l(:label_next)} \xc2\xbb",
                                  (@next_issue_id ? issue_path(@next_issue_id) : nil),
                                  :title => "##{@next_issue_id}" %>
                 </div>
               <% end %>
               <%= avatar(@issue.author, :size => "50") %>
             <div class="subject">
             <%= render_issue_subject_with_tree(@issue) %>
             </div>
                     <p class="author">
                     <%= authoring @issue.created_on, @issue.author %>.
                     <% if @issue.created_on != @issue.updated_on %>
                     <%= l(:label_updated_time, time_tag(@issue.updated_on)).html_safe %>.
                     <% end %>
                     </p>
             <table class="attributes">
             <%= issue_fields_rows do |rows|
               rows.left l(:field_status), h(@issue.status.name), :class => 'status'
               rows.left l(:field_priority), h(@issue.priority.name), :class => 'priority'
               unless @issue.disabled_core_fields.include?('assigned_to_id')
                 rows.left l(:field_assigned_to), avatar(@issue.assigned_to, :size => "14").to_s.html_safe + (@issue.assigned_to ? link_to_user(@issue.assigned_to) : "-"), :class => 'assigned-to'
               end
               unless @issue.disabled_core_fields.include?('category_id')
                 rows.left l(:field_category), h(@issue.category ? @issue.category.name : "-"), :class => 'category'
               end
               unless @issue.disabled_core_fields.include?('fixed_version_id')
                 rows.left l(:field_fixed_version), (@issue.fixed_version ? link_to_version(@issue.fixed_version) : "-"), :class => 'fixed-version'
               end
               unless @issue.disabled_core_fields.include?('start_date')
                 rows.right l(:field_start_date), format_date(@issue.start_date), :class => 'start-date'
               end
               unless @issue.disabled_core_fields.include?('due_date')
                 rows.right l(:field_due_date), format_date(@issue.due_date), :class => 'due-date'
               end
               unless @issue.disabled_core_fields.include?('done_ratio')
                 rows.right l(:field_done_ratio), progress_bar(@issue.done_ratio, :width => '80px', :legend => "#{@issue.done_ratio}%"), :class => 'progress'
               end
               unless @issue.disabled_core_fields.include?('estimated_hours')
                 rows.right l(:field_estimated_hours), l_hours(@issue.estimated_hours), :class => 'estimated-hours'
               end
               if User.current.allowed_to?(:view_time_entries, @project)
                 rows.right l(:label_spent_time), (@issue.total_spent_hours > 0 ? (link_to l_hours(@issue.total_spent_hours), {:controller => 'timelog', :action => 'index', :project_id => @project, :issue_id => @issue}) : "-"), :class => 'spent-time'
               end
             end %>
             <%= render_custom_fields_rows(@issue) %>
             <%= call_hook(:view_issues_show_details_bottom, :issue => @issue) %>
             </table>
             <% if @issue.description? || @issue.attachments.any? -%>
             <hr />
             <% if @issue.description? %>
               <div class="contextual">
-              <%= link_to_remote_if_authorized(
+              <%= link_to l(:button_quote),
-                    l(:button_quote),
+                          {:controller => 'journals', :action => 'new', :id => @issue},
-                    { :url => {:controller => 'journals', :action => 'new', :id => @issue} },
+                          :remote => true,
-                    :class => 'icon icon-comment') %>
+                          :method => 'post',
+                          :class => 'icon icon-comment' if authorize_for('issues', 'edit') %>
               </div>
               <p><strong><%=l(:field_description)%></strong></p>
               <div class="wiki">
               <%= textilizable @issue, :description, :attachments => @issue.attachments %>
               </div>
             <% end %>
             <%= link_to_attachments @issue, :thumbnails => true %>
             <% end -%>
             <%= call_hook(:view_issues_show_description_bottom, :issue => @issue) %>
             <% if !@issue.leaf? || User.current.allowed_to?(:manage_subtasks, @project) %>
             <hr />
             <div id="issue_tree">
             <div class="contextual">
               <%= link_to(l(:button_add), {:controller => 'issues', :action => 'new', :project_id => @project, :issue => {:parent_issue_id => @issue}}) if User.current.allowed_to?(:manage_subtasks, @project) %>
             </div>
             <p><strong><%=l(:label_subtask_plural)%></strong></p>
             <%= render_descendants_tree(@issue) unless @issue.leaf? %>
             </div>
             <% end %>
             <% if @relations.present? || User.current.allowed_to?(:manage_issue_relations, @project) %>
             <hr />
             <div id="relations">
             <%= render :partial => 'relations' %>
             </div>
             <% end %>
             </div>
             <% if @changesets.present? %>
             <div id="issue-changesets">
             <h3><%=l(:label_associated_revisions)%></h3>
             <%= render :partial => 'changesets', :locals => { :changesets => @changesets} %>
             </div>
             <% end %>
             <% if @journals.present? %>
             <div id="history">
             <h3><%=l(:label_history)%></h3>
             <%= render :partial => 'history', :locals => { :issue => @issue, :journals => @journals } %>
             </div>
             <% end %>
             <div style="clear: both;"></div>
             <%= render :partial => 'action_menu' %>
             <div style="clear: both;"></div>
             <% if authorize_for('issues', 'edit') %>
               <div id="update" style="display:none;">
               <h3><%= l(:button_update) %></h3>
               <%= render :partial => 'edit' %>
               </div>
             <% end %>
             <% other_formats_links do |f| %>
               <%= f.link_to 'Atom', :url => {:key => User.current.rss_key} %>
               <%= f.link_to 'PDF' %>
             <% end %>
             <% html_title "#{@issue.tracker.name} ##{@issue.id}: #{@issue.subject}" %>
             <% content_for :sidebar do %>
               <%= render :partial => 'issues/sidebar' %>
               <% if User.current.allowed_to?(:add_issue_watchers, @project) ||
                 (@issue.watchers.present? && User.current.allowed_to?(:view_issue_watchers, @project)) %>
                 <div id="watchers">
                   <%= render :partial => 'watchers/watchers', :locals => {:watched => @issue} %>
                 </div>
               <% end %>
             <% end %>
             <% content_for :header_tags do %>
                 <%= auto_discovery_link_tag(:atom, {:format => 'atom', :key => User.current.rss_key}, :title => "#{@issue.project} - #{@issue.tracker} ##{@issue.id}: #{@issue.subject}") %>
                 <%= stylesheet_link_tag 'scm' %>
             <% end %>
             <%= context_menu issues_context_menu_path %>

app/views/messages/show.html.erb +11 -8

             <%= breadcrumb link_to(l(:label_board_plural), project_boards_path(@project)),
                            link_to(h(@board.name), project_board_path(@project, @board)) %>
             <div class="contextual">
                 <%= watcher_tag(@topic, User.current) %>
-                <%= link_to_remote_if_authorized(
+                <%= link_to(
                       l(:button_quote),
-                      { :url => {:action => 'quote', :id => @topic} },
+                      {:action => 'quote', :id => @topic},
-                      :class => 'icon icon-comment'
+                      :remote => true,
-                    ) unless @topic.locked? %>
+                      :method => 'get',
+                      :class => 'icon icon-comment',
+                      :remote => true) if !@topic.locked? && authorize_for('messages', 'reply') %>
                 <%= link_to(
                       l(:button_edit),
                       {:action => 'edit', :id => @topic},
                       :class => 'icon icon-edit'
                     ) if @message.editable_by?(User.current) %>
                 <%= link_to(
                       l(:button_delete),
                       {:action => 'destroy', :id => @topic},
                       :method => :post,
                       :data => {:confirm => l(:text_are_you_sure)},
                       :class => 'icon icon-del'
                      ) if @message.destroyable_by?(User.current) %>
             </div>
             <h2><%= avatar(@topic.author, :size => "24") %><%=h @topic.subject %></h2>
             <div class="message">
             <p><span class="author"><%= authoring @topic.created_on, @topic.author %></span></p>
             <div class="wiki">
             <%= textilizable(@topic, :content) %>
             </div>
             <%= link_to_attachments @topic, :author => false %>
             </div>
             <br />
             <% unless @replies.empty? %>
             <h3 class="comments"><%= l(:label_reply_plural) %> (<%= @reply_count %>)</h3>
             <% @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} },
+                        {:action => 'quote', :id => message},
-                        :title => l(:button_quote)
+                        :remote => true,
-                      ) unless @topic.locked? %>
+                        :method => 'get',
+                        :title => l(:button_quote)) if !@topic.locked? && authorize_for('messages', 'reply') %>
                   <%= link_to(
                         image_tag('edit.png'),
                         {:action => 'edit', :id => message},
                         :title => l(:button_edit)
                       ) if message.editable_by?(User.current) %>
                   <%= link_to(
                         image_tag('delete.png'),
                         {:action => 'destroy', :id => message},
                         :method => :post,
                         :data => {:confirm => l(:text_are_you_sure)},
                         :title => l(:button_delete)
                       ) if message.destroyable_by?(User.current) %>
                 </div>
               <h4>
                 <%= avatar(message.author, :size => "24") %>
                 <%= link_to h(message.subject), { :controller => 'messages', :action => 'show', :board_id => @board, :id => @topic, :r => message, :anchor => "message-#{message.id}" } %>
                 -
                 <%= authoring message.created_on, message.author %>
               </h4>
               <div class="wiki"><%= textilizable message, :content, :attachments => message.attachments %></div>
               <%= link_to_attachments message, :author => false %>
               </div>
             <% end %>
             <p class="pagination"><%= pagination_links_full @reply_pages, @reply_count, :per_page_links => false %></p>
             <% end %>
             <% if !@topic.locked? && authorize_for('messages', 'reply') %>
             <p><%= toggle_link l(:button_reply), "reply", :focus => 'message_content' %></p>
             <div id="reply" style="display:none;">
             <%= form_for @reply, :as => :reply, :url => {:action => 'reply', :id => @topic}, :html => {:multipart => true, :id => 'message-form'} do |f| %>
               <%= render :partial => 'form', :locals => {:f => f, :replying => true} %>
               <%= submit_tag l(:button_submit) %>
               <%= preview_link({:controller => 'messages', :action => 'preview', :board_id => @board}, 'message-form') %>
             <% end %>
             <div id="preview" class="wiki"></div>
             </div>
             <% end %>
             <% content_for :header_tags do %>
               <%= stylesheet_link_tag 'scm' %>
             <% end %>
             <% html_title @topic.subject %>

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages