jro_apps/redmine Commit - r801:5259dec0611a

Added preview on add/edit issue form....

Jean-Philippe Lang -

r801:5259dec0611a

parent child

Context file:

r801:5259dec0611a

app/controllers/issues_controller.rb +8 -1

             class IssuesController < ApplicationController
               layout 'base', :except => :export_pdf
-              before_filter :find_project, :authorize, :except => :index
+              before_filter :find_project, :authorize, :except => [:index, :preview]
               accept_key_auth :index
               cache_sweeper :issue_sweeper, :only => [ :edit, :change_status, :destroy ]
                 redirect_to :action => 'show', :id => @issue
               end
+              def preview
+                issue = Issue.find_by_id(params[:id])
+                @attachements = issue.attachments if issue
+                @text = params[:issue][:description]
+                render :partial => 'common/preview'
+              end
             private
               def find_project
                 @issue = Issue.find(params[:id], :include => [:project, :tracker, :status, :author, :priority, :category])

app/controllers/wiki_controller.rb +1 -1

                 page = @wiki.find_page(params[:page])
                 @attachements = page.attachments if page
                 @text = params[:content][:text]
-                render :partial => 'preview'
+                render :partial => 'common/preview'
               end
               def add_attachment

app/views/common/_preview.rhtml ~~app/views/wiki/_preview.rhtml~~ renamed 0 0

NO CONTENT: file renamed from app/views/wiki/_preview.rhtml to app/views/common/_preview.rhtml

app/views/issues/_form.rhtml +5 -1

             </div>
             <p><%= f.text_field :subject, :size => 80, :required => true %></p>
-            <p><%= f.text_area :description, :required => true, :cols => 60, :rows => (@issue.description.blank? ? 10 : [[10, @issue.description.length / 50].max, 100].min), :class => 'wiki-edit' %></p>
+            <p><%= f.text_area :description, :required => true,
+                               :cols => 60,
+                               :rows => (@issue.description.blank? ? 10 : [[10, @issue.description.length / 50].max, 100].min),
+                               :accesskey => accesskey(:edit),
+                               :class => 'wiki-edit' %></p>
             <p><%= f.select :fixed_version_id, (@project.versions.sort.collect {|v| [v.name, v.id]}), { :include_blank => true } %></p>
             <% for @custom_value in @custom_values %>
             	<p><%= custom_field_tag_with_label @custom_value %></p>

app/views/issues/edit.rhtml +13 -1

@@ -1,7 +1,19
1	<h2><%=h "#{@issue.tracker.name} ##{@issue.id}" %></h2>	1	<h2><%=h "#{@issue.tracker.name} ##{@issue.id}" %></h2>
2		2
3	<% labelled_tabular_form_for :issue, @issue, ~~:url~~ => {~~:action~~ => ~~'edit'~~} do \|f\| %>	3	<% labelled_tabular_form_for :issue, @issue,
		4	:url => {:action => 'edit'},
		5	:html => {:id => 'issue-form'} do \|f\| %>
4	<%= render :partial => 'form', :locals => {:f => f} %>	6	<%= render :partial => 'form', :locals => {:f => f} %>
5	<%= f.hidden_field :lock_version %>	7	<%= f.hidden_field :lock_version %>
6	<%= submit_tag l(:button_save) %>	8	<%= submit_tag l(:button_save) %>
		9	<%= link_to_remote l(:label_preview),
		10	{ :url => { :controller => 'issues', :action => 'preview', :id => @issue },
		11	:method => 'post',
		12	:update => 'preview',
		13	:with => "Form.serialize('issue-form')",
		14	:complete => "location.href='#preview-top'"
		15	}, :accesskey => accesskey(:preview) %>
7	<% end %>	16	<% end %>
		17
		18	<a name="preview-top"></a>
		19	<div id="preview" class="wiki"></div>

app/views/projects/add_issue.rhtml +13 -1

@@ -1,7 +1,19
1	<h2><%=l(:label_issue_new)%>: <%= @tracker.name %></h2>	1	<h2><%=l(:label_issue_new)%>: <%= @tracker.name %></h2>
2		2
3	<% labelled_tabular_form_for :issue, @issue, :url => {:action => 'add_issue'}, :html => {:multipart => true} do \|f\| %>	3	<% labelled_tabular_form_for :issue, @issue,
		4	:url => {:action => 'add_issue'},
		5	:html => {:multipart => true, :id => 'issue-form'} do \|f\| %>
4	<%= hidden_field_tag 'tracker_id', @tracker.id %>	6	<%= hidden_field_tag 'tracker_id', @tracker.id %>
5	<%= render :partial => 'issues/form', :locals => {:f => f} %>	7	<%= render :partial => 'issues/form', :locals => {:f => f} %>
6	<%= submit_tag l(:button_create) %>	8	<%= submit_tag l(:button_create) %>
		9	<%= link_to_remote l(:label_preview),
		10	{ :url => { :controller => 'issues', :action => 'preview', :id => @issue },
		11	:method => 'post',
		12	:update => 'preview',
		13	:with => "Form.serialize('issue-form')",
		14	:complete => "location.href='#preview-top'"
		15	}, :accesskey => accesskey(:preview) %>
7	<% end %>	16	<% end %>
		17
		18	<a name="preview-top"></a>
		19	<div id="preview" class="wiki"></div>

public/stylesheets/application.css +2 0

             width: 200px;
             }
+            #preview fieldset {margin-top: 1em; background: url(../images/draft.png)}
             #settings .tabular p{ padding-left: 300px; }
             #settings .tabular label{ margin-left: -300px; width: 295px; }

General Comments 0

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

No TODOs yet

	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