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

[refs #90] moved update form lower

This commit is contained in:
Alexander Machehin 2012-05-31 23:30:10 +06:00
parent 60aba754ae
commit 8ed8e10cd6
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/views/projects/pull_requests/show.html.haml
View File

@ -25,6 +25,9 @@
.leftlist=t('activerecord.attributes.issue.body') .leftlist=t('activerecord.attributes.issue.body')
.rightlist.pull_body=@pull.issue.body .rightlist.pull_body=@pull.issue.body
.both .both
.leftlist=t('activerecord.attributes.issue.status')
.rightlist=@pull.issue.status
.both
- if can? :update, @pull.issue - if can? :update, @pull.issue
%br %br
=link_to t('layout.edit'), '#', :id => 'edit_pull_content', :class => 'button' =link_to t('layout.edit'), '#', :id => 'edit_pull_content', :class => 'button'
@ -38,10 +41,8 @@
.both .both
=f.submit t('layout.update'), :id => 'update_pull_content' =f.submit t('layout.update'), :id => 'update_pull_content'
=link_to t('layout.issues.cancel_button'), '#', :id => 'cancel_edit_pull_content', :class => 'button' =link_to t('layout.issues.cancel_button'), '#', :id => 'cancel_edit_pull_content', :class => 'button'
.leftlist=t('activerecord.attributes.issue.status')
.rightlist=@pull.issue.status
.both
- if can? :merge, @pull - if can? :merge, @pull
%br
=form_for PullRequest.new, :url => merge_project_pull_request_path(@project, @pull), :html => { :method => :put, :class => :form } do |f| =form_for PullRequest.new, :url => merge_project_pull_request_path(@project, @pull), :html => { :method => :put, :class => :form } do |f|
=f.submit t 'projects.pull_requests.merge' =f.submit t 'projects.pull_requests.merge'