Download as
Browse Code »

Commit 3960dbb8c9601af4c21c7231eb6fe7c014663773

Authored by Antonio Terceiro
2 parents 49a3fa5a a8e44650
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Merge branch 'stable'

Showing 4 changed files with 13 additions and 13 deletions   Show diff stats
app/helpers/folder_helper.rb
  Diff comments   View file @3960dbb
1 1 module FolderHelper
2 2  
3   - include Noosfero::Filenames
  3 + include ShortFilename
4 4  
5 5 def list_articles(articles, recursive = false)
6 6 if !articles.blank?
... ...
app/models/uploaded_file.rb
  Diff comments   View file @3960dbb
... ... @@ -4,7 +4,7 @@
4 4 # of the file itself is kept. (FIXME?)
5 5 class UploadedFile < Article
6 6  
7   - include Noosfero::Filenames
  7 + include ShortFilename
8 8  
9 9 settings_items :title, :type => 'string'
10 10 def title_with_default
... ...
lib/noosfero/filenames.rb
View file @49a3fa5
... ... @@ -1,11 +0,0 @@
1   -module Noosfero::Filenames
2   -
3   - def short_filename(filename, limit_chars = 43)
4   - return filename if filename.size <= limit_chars
5   - extname = File.extname(filename)
6   - basename = File.basename(filename,extname)
7   - str_complement = '(...)'
8   - return basename[0..(limit_chars - extname.size - str_complement.size - 1)] + str_complement + extname
9   - end
10   -
11   -end
lib/short_filename.rb 0 → 100644
  Diff comments   View file @3960dbb
... ... @@ -0,0 +1,11 @@
  1 +module ShortFilename
  2 +
  3 + def short_filename(filename, limit_chars = 43)
  4 + return filename if filename.size <= limit_chars
  5 + extname = File.extname(filename)
  6 + basename = File.basename(filename,extname)
  7 + str_complement = '(...)'
  8 + return basename[0..(limit_chars - extname.size - str_complement.size - 1)] + str_complement + extname
  9 + end
  10 +
  11 +end
... ...