Merge pull request #8 from abf/rosa-build:6-arch-field-should-be-hidden-for-ProductBuildList
#6: "Arch" field should be hidden for "ProductBuildList"
This commit is contained in:
commit
9d8b8d8a1e
|
@ -34,7 +34,8 @@ class ProductBuildList < ActiveRecord::Base
|
||||||
belongs_to :arch
|
belongs_to :arch
|
||||||
belongs_to :user
|
belongs_to :user
|
||||||
|
|
||||||
|
# see: Issue #6
|
||||||
|
before_validation lambda { self.arch_id = Arch.find_by_name('x86_64').id }
|
||||||
validates :product_id,
|
validates :product_id,
|
||||||
:status,
|
:status,
|
||||||
:project_id,
|
:project_id,
|
||||||
|
@ -52,7 +53,6 @@ class ProductBuildList < ActiveRecord::Base
|
||||||
:params,
|
:params,
|
||||||
:project_version,
|
:project_version,
|
||||||
:commit_hash,
|
:commit_hash,
|
||||||
:arch_id,
|
|
||||||
:product_id
|
:product_id
|
||||||
attr_readonly :product_id
|
attr_readonly :product_id
|
||||||
serialize :results, Array
|
serialize :results, Array
|
||||||
|
|
|
@ -12,10 +12,6 @@ json.product_build_list do |json|
|
||||||
:project => @product_build_list.project, :json => json_project
|
:project => @product_build_list.project, :json => json_project
|
||||||
end
|
end
|
||||||
|
|
||||||
json.arch do |json_arch|
|
|
||||||
json_arch.(@product_build_list.arch, :id, :name)
|
|
||||||
end
|
|
||||||
|
|
||||||
json.created_at @product_build_list.created_at.to_i
|
json.created_at @product_build_list.created_at.to_i
|
||||||
json.updated_at @product_build_list.updated_at.to_i
|
json.updated_at @product_build_list.updated_at.to_i
|
||||||
|
|
||||||
|
|
|
@ -12,10 +12,6 @@
|
||||||
.rightlist= f.select :project_version, versions_for_group_select(pbl.project), :selected => params[:product_build_lists].try(:fetch, :project_version) || pbl.project.default_branch
|
.rightlist= f.select :project_version, versions_for_group_select(pbl.project), :selected => params[:product_build_lists].try(:fetch, :project_version) || pbl.project.default_branch
|
||||||
.both
|
.both
|
||||||
|
|
||||||
.leftlist= f.label :arch, t("activerecord.attributes.product_build_list.arch"), :class => :label
|
|
||||||
.rightlist= f.select :arch_id, Arch.recent.map{ |a| [a.name, a.id]}
|
|
||||||
.both
|
|
||||||
|
|
||||||
= render 'platforms/products/def_fields', :f => f
|
= render 'platforms/products/def_fields', :f => f
|
||||||
|
|
||||||
= f.submit t("layout.projects.build_button")
|
= f.submit t("layout.projects.build_button")
|
||||||
|
|
|
@ -19,7 +19,6 @@
|
||||||
|
|
||||||
= render 'show_field', :key => :project_version, :value => product_build_list_version_link(pbl, true)
|
= render 'show_field', :key => :project_version, :value => product_build_list_version_link(pbl, true)
|
||||||
|
|
||||||
= render 'show_field', :key => :arch, :value => pbl.arch.name
|
|
||||||
- [:main_script, :params].each do |el|
|
- [:main_script, :params].each do |el|
|
||||||
= render 'show_field', :key => el, :value => pbl.send(el)
|
= render 'show_field', :key => el, :value => pbl.send(el)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue