Download as
Browse Code »

Commit 6be0e715e72e548f74eb767c704cc7c0dec69a15

Authored by Rodrigo Souto
2 parents 6cac22b2 01ffe8db
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 commit 'refs/merge-requests/363' of git://gitorious.org/noosfero/noosfero … 

…into merge-requests/363
Showing 3 changed files with 26 additions and 1 deletions   Show diff stats
plugins/custom_forms/db/migrate/20130822001407_set_position_to_existent_custom_forms_plugin_fields.rb 0 → 100644
  Diff comments   View file @6be0e71
@@ -0,0 +1,9 @@ @@ -0,0 +1,9 @@
  1 +class SetPositionToExistentCustomFormsPluginFields < ActiveRecord::Migration
  2 + def self.up
  3 + update("UPDATE custom_forms_plugin_fields SET position = 0 WHERE position IS NULL")
  4 + end
  5 +
  6 + def self.down
  7 + say("Nothing to undo (cannot recover the data)")
  8 + end
  9 +end
plugins/custom_forms/lib/custom_forms_plugin/field.rb
  Diff comments   View file @6be0e71
@@ -15,8 +15,12 @@ class CustomFormsPlugin::Field &lt; ActiveRecord::Base @@ -15,8 +15,12 @@ class CustomFormsPlugin::Field &lt; ActiveRecord::Base
15 15
16 before_create do |field| 16 before_create do |field|
17 if field.form.fields.exists? 17 if field.form.fields.exists?
18 - field.position = field.form.fields.order('position').last.position + 1 18 + field.position = field.form.fields.order(:position).last.position + 1
19 end 19 end
20 end 20 end
  21 +
  22 + def position
  23 + self[:position] || 0
  24 + end
21 end 25 end
22 26
plugins/custom_forms/test/unit/custom_forms_plugin/field_test.rb
  Diff comments   View file @6be0e71
@@ -81,5 +81,17 @@ class CustomFormsPlugin::FieldTest &lt; ActiveSupport::TestCase @@ -81,5 +81,17 @@ class CustomFormsPlugin::FieldTest &lt; ActiveSupport::TestCase
81 assert_equal 1, field_1.position 81 assert_equal 1, field_1.position
82 assert_equal 2, field_2.position 82 assert_equal 2, field_2.position
83 end 83 end
  84 +
  85 + should 'not crash when adding new fields on a form with fields without position' do
  86 + form = CustomFormsPlugin::Form.create(:name => 'Free Software', :profile => fast_create(Profile))
  87 + field_0 = CustomFormsPlugin::Field.create(:name => 'License', :form => form)
  88 + field_0.position = nil
  89 + field_0.save
  90 +
  91 + assert_nothing_raised do
  92 + field_1 = CustomFormsPlugin::Field.create!(:name => 'URL', :form => form)
  93 + end
  94 + end
  95 +
84 end 96 end
85 97