Revert range_funds rename.

app/controllers/admin/organizations_controller.rb

@@ -28,10 +28,10 @@ def organization_params
           .permit(:reference, :identifier, :name, :first_name, :last_name, :phones, :email,
                   :web, :address_type, :address, :number, :gateway, :stairs, :floor, :door,
                   :postal_code, :town, :province, :description, :registered_lobbies, :category_id,
-                  :fiscal_year, :range_funds, :subvention, :contract, :denied_public_data, :denied_public_events, interest_ids: [],
+                  :fiscal_year, :range_fund, :subvention, :contract, :denied_public_data, :denied_public_events, interest_ids: [],
                   legal_representant_attributes: [:id, :identifier, :name, :first_name, :last_name, :phones, :email],
                   user_attributes: [:id, :first_name, :last_name, :role, :email, :active, :phones, :password, :password_confirmation],
-                  represented_entities_attributes: [:id, :identifier, :name, :first_name, :last_name, :from, :fiscal_year, :range_funds, :subvention, :contract],
+                  represented_entities_attributes: [:id, :identifier, :name, :first_name, :last_name, :from, :fiscal_year, :range_fund, :subvention, :contract],
                   organization_interests_attributes: [:interest_ids],
                   agents_attributes: [:id, :identifier, :name, :first_name, :last_name, :from, :to, :public_assignments])
   end

app/models/represented_entity.rb

@@ -1,6 +1,6 @@
 class RepresentedEntity < ActiveRecord::Base
 
-  enum range_funds: [:range_1, :range_2, :range_3, :range_4]
+  enum range_fund: [:range_1, :range_2, :range_3, :range_4]
 
   belongs_to :organization
 

app/views/admin/organizations/_lobbies_data.html.erb

@@ -6,8 +6,8 @@
       <%= f.number_field :fiscal_year %>
     </div>
     <div class="small-6 columns">
-      <%= f.label :range_funds, t('backend.lobbies_data.range_funds') %>
-      <%= f.select :range_funds, Organization.range_funds.keys.to_a %>
+      <%= f.label :range_fund, t('backend.lobbies_data.range_fund') %>
+      <%= f.select :range_fund, Organization.range_funds.keys.to_a %>
     </div>
     <div class="small-12 columns">
       <%= f.label :subvention, t('backend.lobbies_data.subvention') %>

app/views/admin/organizations/_represented_entities_fields.html.erb

@@ -33,8 +33,8 @@
     </div>
 
     <div class="small-6 columns">
-      <%= f.label :range_funds, t('backend.represented_entities.range_founds') %>
-      <%= f.select :range_funds, Organization.range_funds.keys.to_a %>
+      <%= f.label :range_fund, t('backend.represented_entities.range_founds') %>
+      <%= f.select :range_fund, Organization.range_funds.keys.to_a %>
     </div>
 
     <div class="small-12 columns">

config/locales/oragnizations.en.yml

@@ -50,7 +50,7 @@ en:
     lobbies_data:
       title_fieldset: "Datos de quien va a ejercer la actividad de lobby por cuenta propia"
       fiscal_year: "Ejercicio anual"
-      range_funds: "Fondos"
+      range_fund: "Fondos"
       subvention: "¿Ha recibido ayudas y/o subvenciones con cargo al Ayuntamiento de Madrid, sus organismos autónomos, sociedades mercantiles o consorcios en los que participe?"
       contract: "¿Ha celebrado contratos y/o convenios con el Ayuntamiento de Madrid, sus organismos autónomos, sociedades mercantiles o consorcios en los que participe?"
 

config/locales/oragnizations.es.yml

@@ -50,7 +50,7 @@ es:
     lobbies_data:
       title_fieldset: "Datos de quien va a ejercer la actividad de lobby por cuenta propia"
       fiscal_year: "Ejercicio anual"
-      range_funds: "Fondos"
+      range_fund: "Fondos"
       subvention: "¿Ha recibido ayudas y/o subvenciones con cargo al Ayuntamiento de Madrid, sus organismos autónomos, sociedades mercantiles o consorcios en los que participe?"
       contract: "¿Ha celebrado contratos y/o convenios con el Ayuntamiento de Madrid, sus organismos autónomos, sociedades mercantiles o consorcios en los que participe?"
 

db/migrate/20171120203928_create_organizations.rb

@@ -23,7 +23,7 @@ def change
       t.string :web
       t.integer :registered_lobbies
       t.integer :fiscal_year
-      t.integer :range_funds
+      t.integer :range_fund
       t.boolean :subvention
       t.boolean :contract
       t.boolean :denied_public_data

db/migrate/20171120204546_create_represented_entities.rb

@@ -9,7 +9,7 @@ def change
       t.date :to
       t.references :organization, index: true, foreign_key: true
       t.integer :fiscal_year
-      t.integer :range_funds
+      t.integer :range_fund
       t.boolean :subvention
       t.boolean :contract       
 

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20171122152500) do
+ActiveRecord::Schema.define(version: 20171122183612) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -191,7 +191,7 @@
     t.string   "web"
     t.integer  "registered_lobbies"
     t.integer  "fiscal_year"
-    t.integer  "range_funds"
+    t.integer  "range_fund"
     t.boolean  "subvention"
     t.boolean  "contract"
     t.boolean  "denied_public_data"
@@ -242,7 +242,7 @@
     t.date     "to"
     t.integer  "organization_id"
     t.integer  "fiscal_year"
-    t.integer  "range_funds"
+    t.integer  "range_fund"
     t.boolean  "subvention"
     t.boolean  "contract"
     t.datetime "created_at",      null: false

spec/factories/organizations.rb

@@ -21,7 +21,7 @@
     web "www.organization.com"
     registered_lobbies :generalitat_catalunya
     fiscal_year 2018
-    range_funds :range_1
+    range_fund :range_1
     subvention false
     contract true
     denied_public_data false

spec/factories/represented_entities.rb

@@ -9,7 +9,7 @@
     from Time.zone.yesterday
     to Time.zone.today
     fiscal_year 2018
-    range_funds :range_1
+    range_fund :range_1
     subvention false
     contract true
     association :organization, factory: :organization