Download as
Browse Code »

Commit 92346b7362d9c9f4c62b24f2b6be9efb6e271d7d

Authored by AntonioTerceiro
1 parent e931f2b9
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

ActionItem158: creating and displaying folders 


git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1787 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 5 changed files with 15 additions and 1 deletions   Show diff stats
app/models/folder.rb
  Diff comments   View file @92346b7
@@ -5,7 +5,11 @@ class Folder < Article @@ -5,7 +5,11 @@ class Folder < Article
5 end 5 end
6 6
7 def self.description 7 def self.description
8 - _('A folder, inside which you can put other articles') 8 + _('A folder, inside which you can put other articles.')
  9 + end
  10 +
  11 + def icon_name
  12 + 'folder'
9 end 13 end
10 14
11 # FIXME we should not need all this just to write a link 15 # FIXME we should not need all this just to write a link
app/views/cms/_folder.rhtml 0 → 100644
  Diff comments   View file @92346b7
@@ -0,0 +1,5 @@ @@ -0,0 +1,5 @@
  1 +
  2 +<%# TODO add Textile help here %>
  3 +
  4 +<%= f.text_field('name', :size => '64') %>
  5 +
public/images/icons-mime/folder.png 0 → 120000
  Diff comments   View file @92346b7
@@ -0,0 +1 @@ @@ -0,0 +1 @@
  1 +gnome-folder.png
0 \ No newline at end of file 2 \ No newline at end of file
public/images/icons-mime/gnome-folder.png 0 → 100644
View file @92346b7

1 KB
test/unit/folder_test.rb
  Diff comments   View file @92346b7
@@ -16,6 +16,10 @@ class FolderTest &lt; ActiveSupport::TestCase @@ -16,6 +16,10 @@ class FolderTest &lt; ActiveSupport::TestCase
16 assert_not_equal Article.short_description, Folder.short_description 16 assert_not_equal Article.short_description, Folder.short_description
17 end 17 end
18 18
  19 + should 'provide own icon name' do
  20 + assert_not_equal Article.new.icon_name, Folder.new.icon_name
  21 + end
  22 +
19 should 'list subitems as HTML content' do 23 should 'list subitems as HTML content' do
20 p = create_user('testuser').person 24 p = create_user('testuser').person
21 f = Folder.create!(:profile => p, :name => 'f') 25 f = Folder.create!(:profile => p, :name => 'f')