Download as
Browse Code »

Commit 17c8b3be7160c27bcda5b339529c42098f421a58

Authored by Hebert Santos
Committed by Tallys Martins
1 parent 05d537e3
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

Fixed bug on plugin views 

Changed html forms to rails3 pattern.

Signed-off-by: Andre Bernardes <andrebsguedes@gmail.com>
Signed-off-by: Hebert Douglas <hebertdougl@gmail>
Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
Showing 2 changed files with 12 additions and 2 deletions   Show diff stats
app/views/cms/upload_files.html.erb
  Diff comments   View file @17c8b3b
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 <h5><%= _('Uploading files to %s') % content_tag('code', @target) %></h5> 20 <h5><%= _('Uploading files to %s') % content_tag('code', @target) %></h5>
21 21
22 <% if @plugins.dispatch(:upload_files_extra_contents).size == 0 %> 22 <% if @plugins.dispatch(:upload_files_extra_contents).size == 0 %>
23 - <% form_for('uploaded_file', :url => { :action => 'upload_files' }, :html => {:multipart => true}) do |f| %> 23 + <%= form_for('uploaded_file', :url => { :action => 'upload_files' }, :html => {:multipart => true}) do |f| %>
24 24
25 <%= render :partial => 'upload_file_form', :locals => { :size => '45'} %> 25 <%= render :partial => 'upload_file_form', :locals => { :size => '45'} %>
26 26
plugins/work_assignment/lib/work_assignment_plugin.rb
  Diff comments   View file @17c8b3b
@@ -54,7 +54,17 @@ class WorkAssignmentPlugin &lt; Noosfero::Plugin @@ -54,7 +54,17 @@ class WorkAssignmentPlugin &lt; Noosfero::Plugin
54 54
55 def upload_files_extra_contents 55 def upload_files_extra_contents
56 proc do 56 proc do
57 - render :partial => 'work_assignment_form', :locals => { :size => '45'} 57 + if params[:parent_id]
  58 + parent_id = params[:parent_id]
  59 + path = Article.find_by_id(parent_id).path.split("/")[0]
  60 + content = profile.articles.find_by_path(path)
  61 +
  62 + if content.type == "WorkAssignmentPlugin::WorkAssignment"
  63 + render :partial => 'work_assignment_form', :locals => { :size => '45'}
  64 + end
  65 + else
  66 + render :partial => 'upload_file_form', :locals => { :size => '45'}
  67 + end
58 end 68 end
59 end 69 end
60 70