1 files changed, 12 insertions, 17 deletions

diff --git a/app/views/issues/index.rhtml b/app/views/issues/index.rhtml
index 408a00eaa..d09ebfe06 100644
--- a/app/views/issues/index.rhtml
+++ b/app/views/issues/index.rhtml
@@ -1,8 +1,14 @@
-<% if @query.new_record? %>
-    <h2><%=l(:label_issue_plural)%></h2>
-    <% html_title(l(:label_issue_plural)) %>
-    
-    <% form_tag({ :controller => 'queries', :action => 'new' }, :id => 'query_form') do %>
+<div class="contextual">
+<% if !@query.new_record? && @query.editable_by?(User.current) %>
+	<%= link_to l(:button_edit), {:controller => 'queries', :action => 'edit', :id => @query}, :class => 'icon icon-edit' %>
+	<%= link_to l(:button_delete), {:controller => 'queries', :action => 'destroy', :id => @query}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
+<% end %>
+</div>
+
+<h2><%= @query.new_record? ? l(:label_issue_plural) : h(@query.name) %></h2>
+<% html_title(@query.new_record? ? l(:label_issue_plural) : @query.name) %>
+
+<% form_tag({ :controller => 'queries', :action => 'new' }, :id => 'query_form') do %>
     <%= hidden_field_tag('project_id', @project.to_param) if @project %>
 		<div id="query_form_content">
     <fieldset id="filters" class="collapsible">
@@ -33,21 +39,10 @@
                          :update => "content",
                        }, :class => 'icon icon-reload'  %>
                        
-    <% if User.current.allowed_to?(:save_queries, @project, :global => true) %>
+    <% if @query.new_record? && User.current.allowed_to?(:save_queries, @project, :global => true) %>
     <%= link_to l(:button_save), {}, :onclick => "$('query_form').submit(); return false;", :class => 'icon icon-save' %>
     <% end %>
     </p>
-    <% end %>
-<% else %>
-    <div class="contextual">
-    <% if @query.editable_by?(User.current) %>
-    <%= link_to l(:button_edit), {:controller => 'queries', :action => 'edit', :id => @query}, :class => 'icon icon-edit' %>
-    <%= link_to l(:button_delete), {:controller => 'queries', :action => 'destroy', :id => @query}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
-    <% end %>
-    </div>
-    <h2><%=h @query.name %></h2>
-    <div id="query_form"></div>
-    <% html_title @query.name %>
 <% end %>
 
 <%= error_messages_for 'query' %>