diff options
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/context_menus/issues.html.erb | 9 | ||||
| -rw-r--r-- | app/views/issues/_action_menu.html.erb | 3 | ||||
| -rw-r--r-- | app/views/issues/_form.html.erb | 2 | ||||
| -rw-r--r-- | app/views/issues/new.html.erb | 3 |
4 files changed, 10 insertions, 7 deletions
diff --git a/app/views/context_menus/issues.html.erb b/app/views/context_menus/issues.html.erb index 628433cb7..ce418af58 100644 --- a/app/views/context_menus/issues.html.erb +++ b/app/views/context_menus/issues.html.erb @@ -107,11 +107,12 @@ <% end %> <% if @issue.present? %> - <li><%= context_menu_link l(:button_duplicate), {:controller => 'issues', :action => 'new', :project_id => @project, :copy_from => @issue}, - :class => 'icon-duplicate', :disabled => !@can[:copy] %></li> -<% end %> + <li><%= context_menu_link l(:button_copy), {:controller => 'issues', :action => 'new', :project_id => @project, :copy_from => @issue}, + :class => 'icon-copy', :disabled => !@can[:copy] %></li> +<% else %> <li><%= context_menu_link l(:button_copy), {:controller => 'issues', :action => 'bulk_edit', :ids => @issues.collect(&:id), :copy => '1'}, - :class => 'icon-copy', :disabled => !@can[:move] %></li> + :class => 'icon-copy', :disabled => !@can[:move] %></li> +<% end %> <li><%= context_menu_link l(:button_delete), issues_path(:ids => @issues.collect(&:id), :back_url => @back), :method => :delete, :confirm => issues_destroy_confirmation_message(@issues), :class => 'icon-del', :disabled => !@can[:delete] %></li> diff --git a/app/views/issues/_action_menu.html.erb b/app/views/issues/_action_menu.html.erb index d4a6c6552..c643934d1 100644 --- a/app/views/issues/_action_menu.html.erb +++ b/app/views/issues/_action_menu.html.erb @@ -2,7 +2,6 @@ <%= link_to_if_authorized(l(:button_update), {:controller => 'issues', :action => 'edit', :id => @issue }, :onclick => 'showAndScrollTo("update", "notes"); return false;', :class => 'icon icon-edit', :accesskey => accesskey(:edit)) %> <%= link_to_if_authorized l(:button_log_time), {:controller => 'timelog', :action => 'new', :issue_id => @issue}, :class => 'icon icon-time-add' %> <%= watcher_tag(@issue, User.current) %> -<%= link_to_if_authorized l(:button_duplicate), {:controller => 'issues', :action => 'new', :project_id => @project, :copy_from => @issue }, :class => 'icon icon-duplicate' %> -<%= link_to_if_authorized l(:button_copy), {:controller => 'issues', :action => 'bulk_edit', :id => @issue, :copy => '1'}, :class => 'icon icon-copy' %> +<%= link_to_if_authorized l(:button_copy), {:controller => 'issues', :action => 'new', :project_id => @project, :copy_from => @issue}, :class => 'icon icon-copy' %> <%= link_to l(:button_delete), issue_path(@issue), :confirm => issues_destroy_confirmation_message(@issue), :method => :delete, :class => 'icon icon-del' if User.current.allowed_to?(:delete_issues, @project) %> </div> diff --git a/app/views/issues/_form.html.erb b/app/views/issues/_form.html.erb index 4aab69a64..19b5f08eb 100644 --- a/app/views/issues/_form.html.erb +++ b/app/views/issues/_form.html.erb @@ -7,7 +7,7 @@ </p> <% end %> -<% if !@issue.new_record? && @issue.safe_attribute?('project_id') %> +<% if @issue.safe_attribute? 'project_id' %> <p><%= f.select :project_id, project_tree_options_for_select(Issue.allowed_target_projects_on_move, :selected => @issue.project), :required => true %></p> <%= observe_field :issue_project_id, :url => project_issue_form_path(@project, :id => @issue, :project_change => '1'), :with => "Form.serialize('issue-form')" %> diff --git a/app/views/issues/new.html.erb b/app/views/issues/new.html.erb index 615263b23..e7a6bcaca 100644 --- a/app/views/issues/new.html.erb +++ b/app/views/issues/new.html.erb @@ -5,8 +5,11 @@ <% 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> <p id="attachments_form"><%= label_tag('attachments[1][file]', l(:label_attachment_plural))%><%= render :partial => 'attachments/form' %></p> |