diff --git a/app/helpers/folder_helper.rb b/app/helpers/folder_helper.rb index a8095e4..85ac222 100644 --- a/app/helpers/folder_helper.rb +++ b/app/helpers/folder_helper.rb @@ -1,5 +1,7 @@ module FolderHelper + include ShortFilename + def list_articles(articles, recursive = false) if !articles.blank? content_tag( diff --git a/app/models/uploaded_file.rb b/app/models/uploaded_file.rb index 5d97289..26195a8 100644 --- a/app/models/uploaded_file.rb +++ b/app/models/uploaded_file.rb @@ -4,7 +4,7 @@ # of the file itself is kept. (FIXME?) class UploadedFile < Article - include Noosfero::Filenames + include ShortFilename settings_items :title, :type => 'string' def title_with_default diff --git a/lib/noosfero/filenames.rb b/lib/noosfero/filenames.rb deleted file mode 100644 index bceb119..0000000 --- a/lib/noosfero/filenames.rb +++ /dev/null @@ -1,11 +0,0 @@ -module Noosfero::Filenames - - def short_filename(filename, limit_chars = 43) - return filename if filename.size <= limit_chars - extname = File.extname(filename) - basename = File.basename(filename,extname) - str_complement = '(...)' - return basename[0..(limit_chars - extname.size - str_complement.size - 1)] + str_complement + extname - end - -end diff --git a/lib/short_filename.rb b/lib/short_filename.rb new file mode 100644 index 0000000..86f636e --- /dev/null +++ b/lib/short_filename.rb @@ -0,0 +1,11 @@ +module ShortFilename + + def short_filename(filename, limit_chars = 43) + return filename if filename.size <= limit_chars + extname = File.extname(filename) + basename = File.basename(filename,extname) + str_complement = '(...)' + return basename[0..(limit_chars - extname.size - str_complement.size - 1)] + str_complement + extname + end + +end -- libgit2 0.21.2