Download as
Browse Code »

Commit daea8e3e9b8dda33ea358b0bbf329a6ef3f739fe

Authored by Rodrigo Souto
2 parents 4711e596 840d5aa0
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

Merge branch 'ai3145' into 'stable' 

Fix duplicate author folder creation and duplicate save of work assignments

http://noosfero.org/Development/ActionItem3145
Showing 2 changed files with 2 additions and 4 deletions   Show diff stats
plugins/work_assignment/lib/ext/uploaded_file.rb
  Diff comments   View file @daea8e3
@@ -2,13 +2,11 @@ require_dependency 'article' @@ -2,13 +2,11 @@ require_dependency 'article'
2 require_dependency 'uploaded_file' 2 require_dependency 'uploaded_file'
3 3
4 class UploadedFile < Article 4 class UploadedFile < Article
5 - after_save do |uploaded_file| 5 + before_validation do |uploaded_file|
6 if uploaded_file.parent.kind_of?(WorkAssignmentPlugin::WorkAssignment) 6 if uploaded_file.parent.kind_of?(WorkAssignmentPlugin::WorkAssignment)
7 author_folder = uploaded_file.parent.find_or_create_author_folder(uploaded_file.author) 7 author_folder = uploaded_file.parent.find_or_create_author_folder(uploaded_file.author)
8 uploaded_file.name = WorkAssignmentPlugin::WorkAssignment.versioned_name(uploaded_file, author_folder) 8 uploaded_file.name = WorkAssignmentPlugin::WorkAssignment.versioned_name(uploaded_file, author_folder)
9 uploaded_file.parent = author_folder 9 uploaded_file.parent = author_folder
10 - logger.info("\n\n==> #{uploaded_file.name}\n\n")  
11 - uploaded_file.save!  
12 end 10 end
13 end 11 end
14 end 12 end
plugins/work_assignment/lib/work_assignment_plugin/work_assignment.rb
  Diff comments   View file @daea8e3
@@ -33,7 +33,7 @@ class WorkAssignmentPlugin::WorkAssignment &lt; Folder @@ -33,7 +33,7 @@ class WorkAssignmentPlugin::WorkAssignment &lt; Folder
33 end 33 end
34 34
35 def find_or_create_author_folder(author) 35 def find_or_create_author_folder(author)
36 - children.find_by_slug(author.identifier.to_slug) || Folder.create!(:name => author.name, :slug => author.identifier.to_slug, :parent => self, :profile => profile) 36 + children.find_by_slug(author.identifier) || Folder.create!(:name => author.name, :slug => author.identifier, :parent => self, :profile => profile)
37 end 37 end
38 38
39 def submissions 39 def submissions