Commit cfbcd2b4 authored by Bryce Johnson's avatar Bryce Johnson

Better scope page specific javascript for widget.

parent 548f9775
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
- content_for :page_specific_javascripts do - content_for :page_specific_javascripts do
= page_specific_javascript_tag('lib/vue_resource.js') = page_specific_javascript_tag('lib/vue_resource.js')
= page_specific_javascript_tag('diff_notes/diff_notes_bundle.js') = page_specific_javascript_tag('diff_notes/diff_notes_bundle.js')
= page_specific_javascript_tag('merge_request_widget/widget_bundle.js')
.merge-request{'data-url' => merge_request_path(@merge_request)} .merge-request{'data-url' => merge_request_path(@merge_request)}
= render "projects/merge_requests/show/mr_title" = render "projects/merge_requests/show/mr_title"
......
- approvers_names = @merge_request.approvers_left.map(&:name).to_json - approvers_names = @merge_request.approvers_left.map(&:name).to_json
- more_approvals = @merge_request.approvals_left - @merge_request.approvers_left.count - more_approvals = @merge_request.approvals_left - @merge_request.approvers_left.count
- approvals_left = @merge_request.approvals_left - approvals_left = @merge_request.approvals_left
- content_for :page_specific_javascripts do
= page_specific_javascript_tag('merge_request_widget/widget_bundle.js')
#merge-request-widget-app.mr-state-widget{'data-approved-by-users' => @merge_request.approved_by_users.to_json, 'data-approver-names' => approvers_names,'data-approvals-left' => approvals_left, 'data-more-approvals' => more_approvals, 'data-endpoint'=> '/myendpoint/tho'} #merge-request-widget-app.mr-state-widget{'data-approved-by-users' => @merge_request.approved_by_users.to_json, 'data-approver-names' => approvers_names,'data-approvals-left' => approvals_left, 'data-more-approvals' => more_approvals, 'data-endpoint'=> '/myendpoint/tho'}
= render 'projects/merge_requests/widget/heading' = render 'projects/merge_requests/widget/heading'
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment