jro_apps/redmine Files · app/views/common/_diff.html.erb

set default category_id instead of the object (#11665)...

set default category_id instead of the object (#11665) Rails 2.3 still has issues with synchronizing the association_id and association attributes of an object. That means, if you set the association with an object first and then just set the id afterwards, the object wins and the setting of the id gets lost. This is not an issue in Rails >= 3.1 anymore. Contributed by Holger Just. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@10226 e93f8b46-1217-0410-a6f0-8f06a7374b81

Toshi MARUYAMA - - Load All Authors

File last commit:

r8799:652871d4c3e4


                r10043:14dcefaa97f9

Download file

             _diff.html.erb
        
                    67 lines
            
             | 1.8 KiB
            
                | text/plain
            
             |
                TextLexer

/ app / views / common / _diff.html.erb

History | Source | Raw |Copy content |Copy permalink

Toshi MARUYAMA code layout clean up app/views/common/_diff.html.erb...	r7744	<% diff = Redmine::UnifiedDiff.new(
		diff, :type => diff_type,
		:max_lines => Setting.diff_max_lines_displayed.to_i) -%>
Jean-Philippe Lang Highlight changes inside diff lines (#7139)....	r4974
Jean-Philippe Lang Adds a setting to limit the number of diff lines that should be displayed (default to 1500)....	r2110	<% diff.each do \|table_file\| -%>
Jean-Philippe Lang Move diff viewer to a partial....	r1501	<div class="autoscroll">
Jean-Philippe Lang Highlight changes inside diff lines (#7139)....	r4974	<% if diff.diff_type == 'sbs' -%>
Jean-Philippe Lang Replace the hardcoded "CodeRay" css class name for highlighted elements....	r3471	<table class="filecontent">
Jean-Philippe Lang Move diff viewer to a partial....	r1501	<thead>
Toshi MARUYAMA scm: attachment: remove "to_utf8" methods from helpers (#2371)...	r7751	<tr>
		<th colspan="4" class="filename">
		<%= h(Redmine::CodesetUtil.to_utf8_by_setting(table_file.file_name)) %>
		</th>
		</tr>
Jean-Philippe Lang Move diff viewer to a partial....	r1501	</thead>
		<tbody>
Jean-Philippe Lang Highlight changes inside diff lines (#7139)....	r4974	<% table_file.each_line do \|spacing, line\| -%>
		<% if spacing -%>
Jean-Philippe Lang Slight changes to diff view and style....	r1509	<tr class="spacing">
Jean-Philippe Lang Highlight changes inside diff lines (#7139)....	r4974	<th class="line-num">...</th><td></td><th class="line-num">...</th><td></td>
		</tr>
Jean-Philippe Lang Move diff viewer to a partial....	r1501	<% end -%>
		<tr>
Jean-Philippe Lang Highlight changes inside diff lines (#7139)....	r4974	<th class="line-num"><%= line.nb_line_left %></th>
		<td class="line-code <%= line.type_diff_left %>">
Toshi MARUYAMA Rails3: view: html_safe for common/_diff.html.erb...	r8799	<pre><%= Redmine::CodesetUtil.to_utf8_by_setting(line.html_line_left).html_safe %></pre>
Jean-Philippe Lang Move diff viewer to a partial....	r1501	</td>
Jean-Philippe Lang Highlight changes inside diff lines (#7139)....	r4974	<th class="line-num"><%= line.nb_line_right %></th>
		<td class="line-code <%= line.type_diff_right %>">
Toshi MARUYAMA Rails3: view: html_safe for common/_diff.html.erb...	r8799	<pre><%= Redmine::CodesetUtil.to_utf8_by_setting(line.html_line_right).html_safe %></pre>
Jean-Philippe Lang Move diff viewer to a partial....	r1501	</td>
		</tr>
		<% end -%>
		</tbody>
		</table>

		<% else -%>
Jean-Philippe Lang Highlight changes inside diff lines (#7139)....	r4974	<table class="filecontent">
Jean-Philippe Lang Move diff viewer to a partial....	r1501	<thead>
Toshi MARUYAMA scm: attachment: remove "to_utf8" methods from helpers (#2371)...	r7751	<tr>
		<th colspan="3" class="filename">
		<%= h(Redmine::CodesetUtil.to_utf8_by_setting(table_file.file_name)) %>
		</th>
		</tr>
Jean-Philippe Lang Move diff viewer to a partial....	r1501	</thead>
		<tbody>
Jean-Philippe Lang Highlight changes inside diff lines (#7139)....	r4974	<% table_file.each_line do \|spacing, line\| %>
		<% if spacing -%>
Jean-Philippe Lang Slight changes to diff view and style....	r1509	<tr class="spacing">
Jean-Philippe Lang Highlight changes inside diff lines (#7139)....	r4974	<th class="line-num">...</th><th class="line-num">...</th><td></td>
Jean-Philippe Lang Slight changes to diff view and style....	r1509	</tr>
Jean-Philippe Lang Move diff viewer to a partial....	r1501	<% end -%>
		<tr>
Jean-Philippe Lang Highlight changes inside diff lines (#7139)....	r4974	<th class="line-num"><%= line.nb_line_left %></th>
		<th class="line-num"><%= line.nb_line_right %></th>
		<td class="line-code <%= line.type_diff %>">
Toshi MARUYAMA Rails3: view: html_safe for common/_diff.html.erb...	r8799	<pre><%= Redmine::CodesetUtil.to_utf8_by_setting(line.html_line).html_safe %></pre>
Jean-Philippe Lang Move diff viewer to a partial....	r1501	</td>
		</tr>
		<% end -%>
		</tbody>
		</table>
		<% end -%>
		</div>
		<% end -%>
Jean-Philippe Lang Adds a setting to limit the number of diff lines that should be displayed (default to 1500)....	r2110
		<%= l(:text_diff_truncated) if diff.truncated? %>

	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