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

[refs #90] modified Update commits button

This commit is contained in:
Alexander Machehin 2012-07-10 00:41:39 +06:00
parent dd221cc880
commit 07e02d9a17
4 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/assets/javascripts/extra/pull.js
View File

@ -28,4 +28,14 @@ $(document).ready(function() {
$('#edit_pull_content').fadeIn('fast');
});
$('#pull_request_base_project').on('autocompleteselect', function(event, data){
$('input#base_refs').autocomplete('option', 'source', data.item.refs);
});
$('#pull_request_base_project, input#base_refs, input#head_refs').on('autocompleteselect', function(event, data){
var tmp = $('#update_action').val();
$('#new_pull_request').attr('action', $('#update_action').val());
$('#update_pull').fadeIn('fast');
});
});

1
app/models/project.rb
View File

@ -103,6 +103,7 @@ class Project < ActiveRecord::Base
end
def branches_and_tags
#@branches_and_tags ||= branches + tags # ???
branches + tags
end

8
app/models/pull_request.rb
View File

@ -31,8 +31,12 @@ class PullRequest < ActiveRecord::Base
transition [:ready, :open, :blocked] => :ready
end
event :already do
transition [:ready, :open, :blocked] => :already
end
event :block do
transition [:blocked, :open, :ready] => :blocked
transition [:ready, :open, :blocked] => :blocked
end
event :merging do
@ -40,7 +44,7 @@ class PullRequest < ActiveRecord::Base
end
event :close do
transition [:open, :ready, :blocked] => :closed
transition [:ready, :open, :blocked] => :closed
end
event :reopen do

12
app/views/projects/pull_requests/new.html.haml
View File

@ -14,6 +14,7 @@
.tab-content.pull_diff_fix
#discussion.tab-pane.active
=form_for @pull, :url => (@pull.status != 'already' ? project_pull_requests_path : new_project_pull_requests_path), :html => {:class => 'well well-large'} do |f|
=hidden_field_tag :update_action, new_project_pull_requests_path
.leftlist=f.label :base_project, t('.base_project'), :class => :label
.rightlist
=f.autocomplete_field :base_project, autocomplete_base_project_project_pull_requests_path, :value => @pull.base_project.full_name, :id_element => '#pull_request_base_project_id', :name => 'base_project'
@ -32,7 +33,7 @@
%input{:id => 'head_refs', :value => @pull.head_ref, :name => 'pull_request[head_ref]'}
.both
.leftlist
.rightlist=f.submit t('.update'), :class => 'btn btn-primary disabled', 'data-loading-text' => t('layout.processing')#, :id => 'create_pull'
.rightlist=f.submit t('.update'), :class => 'btn btn-primary disabled', 'data-loading-text' => t('layout.processing'), :style => @pull.already? ? '' : 'display: none;', :id => 'update_pull'
.both
=f.fields_for :issue do |issue|
.leftlist=issue.label :title, t('activerecord.attributes.issue.title'), :class => :label
@ -46,7 +47,8 @@
.rightlist=@pull.status
.both
.leftlist
.rightlist=f.submit t(@pull.status != 'already' ? '.submit' : '.update'), :class => 'btn btn-primary disabled', 'data-loading-text' => t('layout.processing')#, :id => 'create_pull'
.rightlist
=f.submit t('.submit'), :class => 'btn btn-primary disabled', 'data-loading-text' => t('layout.processing'), :id => 'create_pull' unless @pull.already?
.both
=render 'diff_commits_tabs' if @pull.status != 'already' && @stats != nil
@ -60,11 +62,5 @@
$('input#head_refs').autocomplete({
source: #{@project.branches_and_tags.map &:name}
});
$('#pull_request_base_project').on('autocompleteselect', function(event, data){
/* Do something here */
$('input#base_refs').autocomplete('option', 'source', data.item.refs);
alert('work?');
});
});