Software
/
rosa-build
mirror of https://github.com/OpenMandrivaSoftware/rosa-build.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Tune project specific build_lists page filters. Cleanup. Refs #223

This commit is contained in:
Pavel Chipiga 2012-03-22 22:58:02 +02:00
parent 9cbc30cdde
commit 7f31246463
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/build_list/filter.rb
View File

@ -56,7 +56,7 @@ class BuildList::Filter
:project_name => nil :project_name => nil
})) }))
@options[:ownership] = @options[:ownership].presence || 'owned' @options[:ownership] = @options[:ownership].presence || (@project ? 'index' : 'owned')
@options[:status] = @options[:status].present? ? @options[:status].to_i : nil @options[:status] = @options[:status].present? ? @options[:status].to_i : nil
@options[:created_at_start] = build_date_from_params(:created_at_start, @options) @options[:created_at_start] = build_date_from_params(:created_at_start, @options)
@options[:created_at_end] = build_date_from_params(:created_at_end, @options) @options[:created_at_end] = build_date_from_params(:created_at_end, @options)

9
app/views/build_lists/_filter.html.haml
View File

@ -24,10 +24,11 @@
.lefter= f.radio_button :ownership, 'owned', :class => 'niceRadio', :id => 'myradio1' .lefter= f.radio_button :ownership, 'owned', :class => 'niceRadio', :id => 'myradio1'
.lefter= t("layout.build_lists.ownership.owned") .lefter= t("layout.build_lists.ownership.owned")
.both .both
.table - unless @project
.lefter= f.radio_button :ownership, 'related', :class => 'niceRadio', :id => 'myradio2' .table
.lefter= t("layout.build_lists.ownership.related") .lefter= f.radio_button :ownership, 'related', :class => 'niceRadio', :id => 'myradio2'
.both .lefter= t("layout.build_lists.ownership.related")
.both
.table .table
.lefter= f.radio_button :ownership, 'index', :class => 'niceRadio', :id => 'myradio3' .lefter= f.radio_button :ownership, 'index', :class => 'niceRadio', :id => 'myradio3'
.lefter= t("layout.build_lists.ownership.index") .lefter= t("layout.build_lists.ownership.index")

2
config/initializers/core.rb
View File

@ -1,2 +0,0 @@
# -*- encoding : utf-8 -*-
require './lib/ext/core/string'