jro_apps/redmine Commit - r15015:3d2c198c0f88

Add view for "no preview" repository files (#22482)....

Jean-Philippe Lang -

r15015:3d2c198c0f88

parent child

Context file:

r15015:3d2c198c0f88

Collapse all files

app/views/common/_other.html.erb created 644 +1 0

	@@ -0,0 +1,1
				1	<p class="nodata"><%= l(:label_no_preview) %></p>

app/controllers/repositories_controller.rb +15 -13

@@ -168,24 +168,26 class RepositoriesController < ApplicationController
168	# If the entry is a dir, show the browser	168	# If the entry is a dir, show the browser
169	(show; return) if @entry.is_dir?	169	(show; return) if @entry.is_dir?
170		170
171	@content = @repository.cat(@path, @rev)	171	if is_raw
172	(show_error_not_found; return) unless @content
173	if !is_raw && Redmine::MimeType.is_type?('image', @path)
174	# simply render
175	elsif is_raw \|\|
176	(@content.size && @content.size > Setting.file_max_size_displayed.to_i.kilobyte) \|\|
177	! is_entry_text_data?(@content, @path)
178	# Force the download	172	# Force the download
179	send_opt = { :filename => filename_for_content_disposition(@path.split('/').last) }	173	send_opt = { :filename => filename_for_content_disposition(@path.split('/').last) }
180	send_type = Redmine::MimeType.of(@path)	174	send_type = Redmine::MimeType.of(@path)
181	send_opt[:type] = send_type.to_s if send_type	175	send_opt[:type] = send_type.to_s if send_type
182	send_opt[:disposition] = (Redmine::MimeType.is_type?('image', @path) && !~~is_raw~~ ? 'inline' : 'attachment')	176	send_opt[:disposition] = (Redmine::MimeType.is_type?('image', @path) ? 'inline' : 'attachment')
183	send_data @~~content~~, send_opt	177	send_data @repository.cat(@path, @rev), send_opt
184	else	178	else
185	# Prevent empty lines when displaying a file with Windows style eol	179	if !@entry.size \|\| @entry.size <= Setting.file_max_size_displayed.to_i.kilobyte
186	# TODO: UTF-16	180	content = @repository.cat(@path, @rev)
187	# Is this needs? AttachmentsController reads file simply.	181	(show_error_not_found; return) unless content
188	@content.gsub!("\r\n", "\n")	182
		183	if content.size <= Setting.file_max_size_displayed.to_i.kilobyte &&
		184	is_entry_text_data?(content, @path)
		185	# TODO: UTF-16
		186	# Prevent empty lines when displaying a file with Windows style eol
		187	# Is this needed? AttachmentsController simply reads file.
		188	@content = content.gsub("\r\n", "\n")
		189	end
		190	end
189	@changeset = @repository.find_changeset_by_name(@rev)	191	@changeset = @repository.find_changeset_by_name(@rev)
190	end	192	end
191	end	193	end

app/views/repositories/entry.html.erb +3 -1

             <% if Redmine::MimeType.is_type?('image', @path) %>
               <%= render :partial => 'common/image', :locals => {:path => url_for(params.merge(:action => 'raw')), :alt => @path} %>
-            <% else %>
+            <% elsif @content %>
               <%= render :partial => 'common/file', :locals => {:filename => @path, :content => @content} %>
+            <% else %>
+              <%= render :partial => 'common/other' %>
             <% end %>
             <% content_for :header_tags do %>

config/locales/de.yml +1 0

               label_next: Weiter
               label_no_change_option: (Keine Änderung)
               label_no_data: Nichts anzuzeigen
+              label_no_preview: Keine Vorschau verfügbar
               label_no_issues_in_project: keine Tickets im Projekt
               label_nobody: Niemand
               label_none: kein

config/locales/en-GB.yml +1 0

               label_attribute: Attribute
               label_attribute_plural: Attributes
               label_no_data: No data to display
+              label_no_preview: No preview available
               label_change_status: Change status
               label_history: History
               label_attachment: File

config/locales/en.yml +1 0

               label_attribute: Attribute
               label_attribute_plural: Attributes
               label_no_data: No data to display
+              label_no_preview: No preview available
               label_change_status: Change status
               label_history: History
               label_attachment: File

test/functional/repositories_filesystem_controller_test.rb +3 -2

                   end
                 end
-                def test_show_text_file_should_send_if_too_big
+                def test_show_text_file_should_show_other_if_too_big
                   with_settings :file_max_size_displayed => 1 do
                     get :entry, :id => PRJ_ID,
                         :path => repository_path_hash(['japanese', 'big-file.txt'])[:param]
                     assert_response :success
-                    assert_equal 'text/plain', @response.content_type
+                    assert_equal 'text/html', @response.content_type
+                    assert_select 'p.nodata'
                   end
                 end

test/functional/repositories_subversion_controller_test.rb +3 -3

                   assert_template 'entry'
                 end
-                def test_entry_should_send_if_too_big
+                def test_entry_should_show_other_if_too_big
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                     get :entry, :id => PRJ_ID,
                         :path => repository_path_hash(['subversion_test', 'helloworld.c'])[:param]
                     assert_response :success
-                    assert_equal 'attachment; filename="helloworld.c"',
+                    assert_equal 'text/html', @response.content_type
-                                 @response.headers['Content-Disposition']
+                    assert_select 'p.nodata'
                   end
                 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