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

Merge branch 'master' into 258-removeBackboneJS 

Conflicts:
	app/views/projects/build_lists/show.html.haml
This commit is contained in:
Vokhmin Alexey V 2013-08-09 12:49:20 +04:00
parent e7b750cc21 93aea61a3c
commit 9b6cffe5c2
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/extra/build_list.js
View File

@ -79,7 +79,7 @@ $(document).ready(function() {
showButtonPanel: true showButtonPanel: true
}); });
$(document).on('change', '#owner_filter_build_lists, #status_filter_build_lists', function(){ $(document).on('click', '#owner_filter_build_lists, #status_filter_build_lists', function(){
$('#datatable').dataTable().fnDraw(); $('#datatable').dataTable().fnDraw();
}); });

4
app/views/projects/build_lists/_new_form.html.haml
View File

@ -11,7 +11,7 @@
- selected = params[:build_list].try(:[], :save_to_repository_id) ? {:selected => params[:build_list][:save_to_repository_id]} : {} - selected = params[:build_list].try(:[], :save_to_repository_id) ? {:selected => params[:build_list][:save_to_repository_id]} : {}
.lineForm= f.select :save_to_repository_id, save_to_repositories(project), selected .lineForm= f.select :save_to_repository_id, save_to_repositories(project), selected
%h3= t("activerecord.attributes.build_list.project_version") %h3= t("activerecord.attributes.build_list.project_version")
.lineForm= f.select :project_version, versions_for_group_select(project), {}, :selected => params[:build_list].try(:[], :project_version) || project.default_branch .lineForm= f.select :project_version, versions_for_group_select(project), :selected => params[:build_list].try(:[], :project_version) || project.default_branch
%h3= t("activerecord.attributes.build_list.arch") %h3= t("activerecord.attributes.build_list.arch")
- Arch.recent.each do |arch| - Arch.recent.each do |arch|
.both .both
@ -19,7 +19,7 @@
= check_box_tag "arches[]", arch.id, checked, :id => "arches_#{arch.id}" = check_box_tag "arches[]", arch.id, checked, :id => "arches_#{arch.id}"
= label_tag "arches_#{arch.id}", arch.name = label_tag "arches_#{arch.id}", arch.name
%h3= t('activerecord.attributes.build_list.update_type') %h3= t('activerecord.attributes.build_list.update_type')
- selected = params[:build_list].try(:fetch, :update_type) ? {:selected => params[:build_list][:update_version]} : {} - selected = params[:build_list].try(:[], :update_type) ? {:selected => params[:build_list][:update_type]} : {}
.lineForm= f.select :update_type, BuildList::UPDATE_TYPES, selected .lineForm= f.select :update_type, BuildList::UPDATE_TYPES, selected
= render 'shared/autocomplete_form', = render 'shared/autocomplete_form',

3
app/views/projects/build_lists/show.html.haml
View File

@ -55,6 +55,9 @@
.leftlist= t("activerecord.attributes.build_list.auto_create_container") .leftlist= t("activerecord.attributes.build_list.auto_create_container")
.rightlist= t("layout.#{@build_list.auto_create_container?}_") .rightlist= t("layout.#{@build_list.auto_create_container?}_")
.both .both
.leftlist= t("activerecord.attributes.build_list.project_version")
.rightlist= link_to @build_list.project_version, tree_path(@build_list.project, @build_list.project_version)
.both
.leftlist= t("diff") .leftlist= t("diff")
.rightlist= build_list_version_link(@build_list, true) .rightlist= build_list_version_link(@build_list, true)
.both .both