diff --git a/app/assets/javascripts/extra/build_list.js b/app/assets/javascripts/extra/build_list.js index 47ea5a8c3..dd24f24ea 100644 --- a/app/assets/javascripts/extra/build_list.js +++ b/app/assets/javascripts/extra/build_list.js @@ -79,7 +79,7 @@ $(document).ready(function() { 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(); }); diff --git a/app/views/projects/build_lists/_new_form.html.haml b/app/views/projects/build_lists/_new_form.html.haml index fa08aac42..7dc3a64c0 100644 --- a/app/views/projects/build_lists/_new_form.html.haml +++ b/app/views/projects/build_lists/_new_form.html.haml @@ -11,7 +11,7 @@ - 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 %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") - Arch.recent.each do |arch| .both @@ -19,7 +19,7 @@ = check_box_tag "arches[]", arch.id, checked, :id => "arches_#{arch.id}" = label_tag "arches_#{arch.id}", arch.name %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 = render 'shared/autocomplete_form', diff --git a/app/views/projects/build_lists/show.html.haml b/app/views/projects/build_lists/show.html.haml index c29911865..f8e8c6f8b 100644 --- a/app/views/projects/build_lists/show.html.haml +++ b/app/views/projects/build_lists/show.html.haml @@ -55,6 +55,9 @@ .leftlist= t("activerecord.attributes.build_list.auto_create_container") .rightlist= t("layout.#{@build_list.auto_create_container?}_") .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") .rightlist= build_list_version_link(@build_list, true) .both