Commit 6729e4cf authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq

parents 3cd036e3 377d461f
...@@ -4,7 +4,7 @@ class @ImporterStatus ...@@ -4,7 +4,7 @@ class @ImporterStatus
this.setAutoUpdate() this.setAutoUpdate()
initStatusPage: -> initStatusPage: ->
$(".btn-add-to-import").click (event) => $(".js-add-to-import").click (event) =>
new_namespace = null new_namespace = null
tr = $(event.currentTarget).closest("tr") tr = $(event.currentTarget).closest("tr")
id = tr.attr("id").replace("repo_", "") id = tr.attr("id").replace("repo_", "")
...@@ -13,6 +13,10 @@ class @ImporterStatus ...@@ -13,6 +13,10 @@ class @ImporterStatus
tr.find(".import-target").empty().append(new_namespace + "/" + tr.find(".import-target").data("project_name")) tr.find(".import-target").empty().append(new_namespace + "/" + tr.find(".import-target").data("project_name"))
$.post @import_url, {repo_id: id, new_namespace: new_namespace}, dataType: 'script' $.post @import_url, {repo_id: id, new_namespace: new_namespace}, dataType: 'script'
$(".js-import-all").click (event) =>
$(".js-add-to-import").each ->
$(this).click()
setAutoUpdate: -> setAutoUpdate: ->
setInterval (=> setInterval (=>
$.get @jobs_url, (data) => $.get @jobs_url, (data) =>
......
...@@ -4,8 +4,10 @@ ...@@ -4,8 +4,10 @@
%p.light %p.light
Select projects you want to import. Select projects you want to import.
%hr %hr
%p
= button_tag 'Import all projects', class: "btn btn-success js-import-all"
%table.table.import-jobs %table.table.import-jobs
%thead %thead
%tr %tr
...@@ -32,7 +34,7 @@ ...@@ -32,7 +34,7 @@
%td.import-target %td.import-target
= repo.full_name = repo.full_name
%td.import-actions.job-status %td.import-actions.job-status
= button_tag "Add", class: "btn btn-add-to-import" = button_tag "Import", class: "btn js-add-to-import"
:coffeescript :coffeescript
$ -> $ ->
......
...@@ -4,8 +4,10 @@ ...@@ -4,8 +4,10 @@
%p.light %p.light
Select projects you want to import. Select projects you want to import.
%hr %hr
%p
= button_tag 'Import all projects', class: "btn btn-success js-import-all"
%table.table.import-jobs %table.table.import-jobs
%thead %thead
%tr %tr
...@@ -32,8 +34,8 @@ ...@@ -32,8 +34,8 @@
%td.import-target %td.import-target
= repo["path_with_namespace"] = repo["path_with_namespace"]
%td.import-actions.job-status %td.import-actions.job-status
= button_tag "Add", class: "btn btn-add-to-import" = button_tag "Import", class: "btn js-add-to-import"
:coffeescript :coffeescript
$ -> $ ->
new ImporterStatus("#{jobs_import_gitlab_path}", "#{import_gitlab_url}") new ImporterStatus("#{jobs_import_gitlab_path}", "#{import_gitlab_path}")
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