Skip to content
Snippets Groups Projects
Commit db6bad01 authored by Jacob Schatz's avatar Jacob Schatz
Browse files

initial ajax call

parent 51ae8532
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -2,22 +2,42 @@ var MR = function(){
 
var store = {state:{}};
 
var mrService = {
changeState: function(newState) {
mergeFailMessage = 'Unable to update this merge request at this time.'
$.ajax({
type: 'PUT',
url: store.state[newState+'URL'],
error: function(jqXHR, textStatus, errorThrown) {
console.log('error',errorThrown)
return new Flash(mergeFailMessage, 'alert');
},
success: function(data, textStatus, jqXHR) {
console.log("data",data);
}
});
}
};
var init = function(data){
store.state = data;
console.log('initting')
var mrHeader = new Vue({
el: '#merge-request-header',
data: {
status: store.state.status
state: store.state
},
created: function() {
console.log('created');
}
});
created: function() {},
 
var mrServices = {
methods: {
closeClicked: function() {
mrService.changeState('close');
},
 
};
reopenClicked: function() {
mrService.changeState('reopen');
}
}
});
}
 
return {
Loading
Loading
Loading
Loading
@@ -46,16 +46,6 @@ class @MergeRequest
 
initMRBtnListeners: ->
_this = @
$('a.btn-close, a.btn-reopen').on 'click', (e) ->
$this = $(this)
if $this.data('submitted')
return
e.preventDefault()
e.stopImmediatePropagation()
shouldSubmit = $this.hasClass('btn-comment')
console.log("shouldSubmit")
if shouldSubmit
_this.submitNoteForm($this.closest('form'),$this)
 
submitNoteForm: (form, $button) =>
noteText = form.find("textarea.js-note-text").val()
Loading
Loading
Loading
Loading
@@ -97,6 +97,10 @@
:javascript
$(function(){
MR().init({
status: "#{@merge_request.state_human_name}"
label: "#{@merge_request.state_human_name}",
closed: #{@merge_request.closed?},
open: #{@merge_request.open?},
closeURL: "#{merge_request_path(@merge_request, merge_request: { state_event: :close })}",
reopenURL: "#{merge_request_path(@merge_request, merge_request: {state_event: :reopen })}"
});
});
.detail-page-header#merge-request-header{'v-cloak'=> true, transition: "fade"}
.status-box{ class: status_box_class(@merge_request)}
{{ status }}
{{ state.label }}
%span.identifier
Merge Request ##{@merge_request.iid}
%span.creator
Loading
Loading
@@ -16,10 +16,10 @@
 
.issue-btn-group.pull-right
- if can?(current_user, :update_merge_request, @merge_request)
- if @merge_request.open?
= link_to 'Close', merge_request_path(@merge_request, merge_request: { state_event: :close }), method: :put, class: 'btn btn-nr btn-grouped btn-close', title: 'Close merge request'
= link_to edit_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: 'btn btn-nr btn-grouped issuable-edit', id: 'edit_merge_request' do
%i.fa.fa-pencil-square-o
Edit
- if @merge_request.closed?
= link_to 'Reopen', merge_request_path(@merge_request, merge_request: {state_event: :reopen }), method: :put, class: 'btn btn-nr btn-grouped btn-reopen reopen-mr-link', title: 'Reopen merge request'
= link_to 'Close', merge_request_path(@merge_request, merge_request: { state_event: :close }), data: {no_turbolink: true}, class: 'btn btn-nr btn-grouped btn-close', data: {no_turbolink: true}, title: 'Close merge request', "v-show"=>"state.open", "v-on:click.prevent" => "closeClicked"
= link_to 'Reopen', merge_request_path(@merge_request, merge_request: {state_event: :reopen }), data: {no_turbolink: true}, class: 'btn btn-nr btn-grouped btn-reopen reopen-mr-link', title: 'Reopen merge request', "v-show"=>"state.closed", "v-on:click.prevent" => "reopenClicked"
= link_to edit_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: 'btn btn-nr btn-grouped issuable-edit', id: 'edit_merge_request', "v-show"=>"state.open" do
%i.fa.fa-pencil-square-o
Edit
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment