Merge pull request #1767 from bgeuken/fix_add_dod_link

[webui] Fix add DoD link
openSUSE · May 2, 2016 · 88d0993 · 88d0993
2 parents ca55bf7 + 739da1d
commit 88d0993
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 13 deletions.
diff --git a/src/api/app/assets/javascripts/webui/application/repository_tab.js b/src/api/app/assets/javascripts/webui/application/repository_tab.js
@@ -26,7 +26,20 @@ $(document).on(
 
 $(document).on(
   'click',
-  'a#add-dod-repository-link',
+  'a[data-dod-repository-add]',
+  function(e) {
+    e.preventDefault();
+    $(this).
+      parent('.add-dod-repository-link-container').
+      hide().
+      next('.add-dod-repository-form').
+      show();
+  }
+);
+
+$(document).on(
+  'click',
+  '#add-dod-repository-link',
   function(e) {
     e.preventDefault();
     $(this).hide();

diff --git a/src/api/app/views/webui/download_on_demand/_index.html.erb b/src/api/app/views/webui/download_on_demand/_index.html.erb
@@ -3,20 +3,13 @@
   <b>Download on demand sources</b>
   <% if User.current.is_admin? %>
     &nbsp;
-    <span id="<%= "add_dod_repository_link_container_#{repository_id}" %>">
+    <span class="add-dod-repository-link-container">
       <%= sprite_tag('drive_add') %>
-      <%= link_to('Add', '#', id: "add_dod_repository_link_#{repository_id}") %>
+      <%= link_to('Add', '#', data: { "dod-repository-add": true }) %>
     </span>
-    <div class="hidden" id="<%= "add_dod_repository_form_#{repository_id}" %>">
+    <div class="hidden add-dod-repository-form">
       <%= render partial: 'webui/download_on_demand/add', locals: { project: project, repository: repository, download_on_demand: DownloadRepository.new(repository_id: repository.id) } %>
     </div>
-    <% content_for :ready_function do %>
-        $("#<%= "add_dod_repository_link_#{repository_id}" %>").click(function(e) {
-          e.preventDefault();
-          $("#<%= "add_dod_repository_form_#{repository_id}" %>").show();
-          $("#<%= "add_dod_repository_link_container_#{repository_id}" %>").hide();
-        });
-    <% end -%>
   <% end -%>
   <ul style="list-style-type: none;">
   <% repository.download_repositories.each do |dod_element| %>

diff --git a/src/api/spec/features/webui/projects_spec.rb b/src/api/spec/features/webui/projects_spec.rb
@@ -117,7 +117,7 @@
         expect(page).to have_text("My DoD repository")
         expect(page).to have_link("Delete repository")
         expect(page).to have_text("Download on demand sources")
-        expect(page).to have_css("#add_dod_repository_link_container_My_DoD_repository", text: "Add")
+        expect(page).to have_link("Add")
         expect(page).to have_link("Edit")
         expect(page).to have_link("Delete")
         expect(page).to have_link("http://somerandomurl.es")
@@ -187,7 +187,7 @@
         expect(page).to have_link("standard")
         expect(page).to have_link("Delete repository")
         expect(page).to have_text("Download on demand sources")
-        expect(page).to have_css("#add_dod_repository_link_container_standard", text: "Add")
+        expect(page).to have_link("Add")
         expect(page).to have_link("Edit")
         expect(page).to have_link("Delete")
         expect(page).to have_link("http://mola.org2")