jro_apps/redmine Commit - r8079:59c1141e0863

Moved fields specific to new issues to the new issue form....

Jean-Philippe Lang -

r8079:59c1141e0863

parent child

Context file:

r8079:59c1141e0863

Collapse all files

app/views/issues/_form.html.erb 0 -12

             <%= call_hook(:view_issues_form_details_top, { :issue => @issue, :form => f }) %>
             <% if @issue.safe_attribute_names.include?('is_private') %>
             <p style="float:right; margin-right:1em;">
               <label class="inline" for="issue_is_private" id="issue_is_private_label"><%= f.check_box :is_private, :no_label => true %> <%= l(:field_is_private) %></label>
             </p>
             <% end %>
             <p><%= f.select :tracker_id, @project.trackers.collect {|t| [t.name, t.id]}, :required => true %></p>
             <%= observe_field :issue_tracker_id, :url => project_issue_form_path(@project, :id => @issue),
                                                  :update => :attributes,
                                                  :with => "Form.serialize('issue-form')" %>
             <p><%= f.text_field :subject, :size => 80, :required => true %></p>
             <p>
               <label><%= l(:field_description) %></label>
               <%= link_to_function image_tag('edit.png'),
                 'Element.hide(this); Effect.toggle("issue_description_and_toolbar", "appear", {duration:0.3})' unless @issue.new_record? %>
               <% content_tag 'span', :id => "issue_description_and_toolbar", :style => (@issue.new_record? ? nil : 'display:none') do %>
                 <%= f.text_area :description,
                                :cols => 60,
                                :rows => (@issue.description.blank? ? 10 : [[10, @issue.description.length / 50].max, 100].min),
                                :accesskey => accesskey(:edit),
                                :class => 'wiki-edit',
                                :no_label => true %>
               <% end %>
             </p>
             <div id="attributes" class="attributes">
               <%= render :partial => 'issues/attributes' %>
             </div>
-            <% if @issue.new_record? %>
-            <p id="attachments_form"><%= label_tag('attachments[1][file]', l(:label_attachment_plural))%><%= render :partial => 'attachments/form' %></p>
-            <% end %>
-            <% if @issue.new_record? && User.current.allowed_to?(:add_issue_watchers, @project) -%>
-            <p id="watchers_form"><label><%= l(:label_issue_watchers) %></label>
-            <% @issue.project.users.sort.each do |user| -%>
-            <label class="floating"><%= check_box_tag 'issue[watcher_user_ids][]', user.id, @issue.watched_by?(user) %> <%=h user %></label>
-            <% end -%>
-            </p>
-            <% end %>
             <%= call_hook(:view_issues_form_details_bottom, { :issue => @issue, :form => f }) %>
             <%= wikitoolbar_for 'issue_description' %>

app/views/issues/new.html.erb +14 -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' %>
+              <%= error_messages_for 'issue' %>
-                <div class="box tabular">
+              <div class="box tabular">
                 <%= 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>
+                <% if User.current.allowed_to?(:add_issue_watchers, @project) -%>
+                  <p id="watchers_form"><label><%= l(:label_issue_watchers) %></label>
+                  <% @issue.project.users.sort.each do |user| -%>
+                    <label class="floating"><%= check_box_tag 'issue[watcher_user_ids][]', user.id, @issue.watched_by?(user) %> <%=h user %></label>
+                  <% end -%>
+                  </p>
+                <% end %>
+              </div>
                 <%= submit_tag l(:button_create) %>
                 <%= submit_tag l(:button_create_and_continue), :name => 'continue' %>
                 <%= link_to_remote l(:label_preview),
                                    { :url => preview_issue_path(:project_id => @project),
                                      :method => 'post',
                                      :update => 'preview',
                                      :with => "Form.serialize('issue-form')",
                                      :complete => "Element.scrollTo('preview')"
                                    }, :accesskey => accesskey(:preview) %>
                 <%= 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 %>

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