diff --git a/config/locales/models/project.en.yml b/config/locales/models/project.en.yml index 8b5e67b95..f13c3d99f 100644 --- a/config/locales/models/project.en.yml +++ b/config/locales/models/project.en.yml @@ -87,4 +87,4 @@ en: me: Myself group: Group default_branch: Default branch - is_rpm: Project is a packet + is_package: Project is a packet diff --git a/config/locales/models/project.ru.yml b/config/locales/models/project.ru.yml index c97f6c03c..9b4d5b235 100644 --- a/config/locales/models/project.ru.yml +++ b/config/locales/models/project.ru.yml @@ -87,4 +87,4 @@ ru: me: Я group: Группа default_branch: Ветка по умолчанию - is_rpm: Проект является пакетом + is_package: Проект является пакетом diff --git a/db/migrate/20120515095324_rename_is_rpm_to_is_package_in_projects.rb b/db/migrate/20120515095324_rename_is_rpm_to_is_package_in_projects.rb index 7aa8f827d..1d56f3d15 100644 --- a/db/migrate/20120515095324_rename_is_rpm_to_is_package_in_projects.rb +++ b/db/migrate/20120515095324_rename_is_rpm_to_is_package_in_projects.rb @@ -1,9 +1,11 @@ class RenameIsRpmToIsPackageInProjects < ActiveRecord::Migration def up rename_column :projects, :is_rpm, :is_package + change_column :projects, :is_package, :boolean, :default => true, :null => false end def down rename_column :projects, :is_package, :is_rpm + change_column :projects, :is_package, :boolean, :default => true end end diff --git a/db/schema.rb b/db/schema.rb index 8a9b0397d..5d16920a6 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -205,7 +205,7 @@ ActiveRecord::Schema.define(:version => 20120515095324) do t.string "owner_type" t.string "visibility", :default => "open", :null => false t.string "platform_type", :default => "main", :null => false - t.string "distrib_type" + t.string "distrib_type", :null => false end add_index "platforms", ["name"], :name => "index_platforms_on_name", :unique => true, :case_sensitive => false @@ -282,7 +282,7 @@ ActiveRecord::Schema.define(:version => 20120515095324) do t.integer "srpm_file_size" t.datetime "srpm_updated_at" t.string "default_branch", :default => "master" - t.boolean "is_package", :default => true + t.boolean "is_package", :default => true, :null => false t.integer "average_build_time", :default => 0, :null => false t.integer "build_count", :default => 0, :null => false end