Download as
Browse Code »

Commit 1d8ee3ac8b16f5f20a58fe6f728f950388698167

Authored by Antonio Terceiro
1 parent 4651cf61
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

ActionItem918: make it possible to upload files again

Showing 2 changed files with 2 additions and 2 deletions   Show diff stats
app/controllers/my_profile/cms_controller.rb
  Diff comments   View file @1d8ee3a
... ... @@ -27,7 +27,6 @@ class CmsController < MyProfileController
27 27 parent_id = params ? params[:parent_id] : nil
28 28 if !parent_id or !Article.find(parent_id).blog?
29 29 articles += [
30   - Folder,
31 30 RssFeed
32 31 ]
33 32 end
... ... @@ -38,7 +37,7 @@ class CmsController < MyProfileController
38 37 end
39 38  
40 39 def special_article_types
41   - [Blog, UploadedFile]
  40 + [Folder, Blog, UploadedFile]
42 41 end
43 42  
44 43 def view
... ...
app/views/cms/view.rhtml
  Diff comments   View file @1d8ee3a
... ... @@ -18,6 +18,7 @@
18 18 <%= button :add, _('New folder'), :action => 'new', :type => 'Folder', :parent_id => parent_id %>
19 19 <% end %>
20 20 <%= lightbox_button('new', label_for_new_article(@article), :action => 'new', :parent_id => parent_id) %>
  21 + <%= button('save', _('Upload file'), :action => 'new', :parent_id => parent_id, :type => 'UploadedFile') %>
21 22 <% end %>
22 23  
23 24 <table class='cms-articles'>
... ...