consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes conflicts

Browse Source
This commit is contained in:
rgarcia
2016-01-25 22:24:58 +01:00
parent 6adcc6104c 8d54e51413
commit 0505be08e8
15 changed files with 189 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
db/dev_seeds.rb
View File

@@ -233,3 +233,38 @@ puts "Confirming hiding in debates, comments & proposals"
Comment.only_hidden.flagged.reorder("RANDOM()").limit(10).each(&:confirm_hide)
Debate.only_hidden.flagged.reorder("RANDOM()").limit(5).each(&:confirm_hide)
Proposal.only_hidden.flagged.reorder("RANDOM()").limit(5).each(&:confirm_hide)
puts "Creating Tags Categories"
ActsAsTaggableOn::Tag.create!(name: "Asociaciones", featured: true, kind: "category")
puts " Asociaciones"
ActsAsTaggableOn::Tag.create!(name: "Cultura", featured: true, kind: "category")
puts " Cultura"
ActsAsTaggableOn::Tag.create!(name: "Deportes", featured: true, kind: "category")
puts " Deportes"
ActsAsTaggableOn::Tag.create!(name: "Derechos SMedio Ambienteociales", featured: true, kind: "category")
puts " Derechos Sociales"
ActsAsTaggableOn::Tag.create!(name: "Economía", featured: true, kind: "category")
puts " Economía"
ActsAsTaggableOn::Tag.create!(name: "Empleo", featured: true, kind: "category")
puts " Empleo"
ActsAsTaggableOn::Tag.create!(name: "Equidad", featured: true, kind: "category")
puts " Equidad"
ActsAsTaggableOn::Tag.create!(name: "Sostenibilidad", featured: true, kind: "category")
puts " Sostenibilidad"
ActsAsTaggableOn::Tag.create!(name: "Participación", featured: true, kind: "category")
puts " Participación"
ActsAsTaggableOn::Tag.create!(name: "Movilidad", featured: true, kind: "category")
puts " Movilidad"
ActsAsTaggableOn::Tag.create!(name: "Medios", featured: true, kind: "category")
puts " Medios"
ActsAsTaggableOn::Tag.create!(name: "Salud", featured: true , kind: "category")
puts " Salud"
ActsAsTaggableOn::Tag.create!(name: "Transparencia", featured: true, kind: "category")
puts " Transparencia"
ActsAsTaggableOn::Tag.create!(name: "Seguridad y Emergencias", featured: true, kind: "category")
puts " Seguridad y Emergencias"
ActsAsTaggableOn::Tag.create!(name: "Medio Ambiente", featured: true, kind: "category")
puts " Medio Ambiente"

5
db/migrate/20160108101736_add_kind_to_tags.rb Normal file
View File

@@ -0,0 +1,5 @@
class AddKindToTags < ActiveRecord::Migration
def change
add_column :tags, :kind, :string, limit: 40
end
end

3
db/schema.rb
View File

@@ -199,7 +199,7 @@ ActiveRecord::Schema.define(version: 20160122153329) do
create_table "locks", force: :cascade do |t|
t.integer "user_id"
t.integer "tries", default: 0
t.datetime "locked_until", default: '2000-01-01 00:01:01', null: false
t.datetime "locked_until", default: '2000-01-01 07:01:01', null: false
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
end
@@ -315,6 +315,7 @@ ActiveRecord::Schema.define(version: 20160122153329) do
t.boolean "featured", default: false
t.integer "debates_count", default: 0
t.integer "proposals_count", default: 0
t.string "kind", limit: 40
t.integer "spending_proposals_count", default: 0
end