Merge pull request #6503 from Ana06/bug-dod

Fix repositories page permissions bug
openSUSE · Dec 10, 2018 · 886a36c · 886a36c
2 parents 6658fa6 + e8175e7
commit 886a36c
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 23 deletions.
diff --git a/src/api/app/assets/stylesheets/webui2/repositories.scss b/src/api/app/assets/stylesheets/webui2/repositories.scss
@@ -11,3 +11,8 @@ details[open].repository-path {
   .more{ display: none; }
 }
 
+// Ensure repository footer has same height when being empty
+.repository-card .card-footer .row {
+  min-height: 24px;
+}
+
diff --git a/src/api/app/views/webui2/webui/repositories/_dod_repository_card_content.html.haml b/src/api/app/views/webui2/webui/repositories/_dod_repository_card_content.html.haml
@@ -8,24 +8,31 @@
           = link_to("#{dod_element.url}", target: '_blank', title: 'Go to the repository') do
             = dod_element.url
           (#{dod_element.repotype})
-        = link_to('#', title: 'Edit DoD Source', data: { toggle: 'modal', target: "#edit-dod-source-modal-#{dod_element.id}" }) do
-          %i.fas.fa-edit.text-secondary
-        = link_to('#', title: 'Delete Downdload on Demand source',
-                       data: { toggle: 'modal', target: "#delete-dod-source-#{dod_element.id}" }) do
-          %i.fas.fa-times-circle.text-danger
-        = render partial: 'edit_dod_source_modal', locals: { repository: repository, project: project, download_on_demand: dod_element }
-        = render partial: 'delete_dod_source_modal', locals: { repository: repository, project: project, download_on_demand: dod_element }
+        - if User.current.can_modify?(project)
+          = link_to('#', title: 'Edit DoD Source', data: { toggle: 'modal', target: "#edit-dod-source-modal-#{dod_element.id}" }) do
+            %i.fas.fa-edit.text-secondary
+          = link_to('#', title: 'Delete Downdload on Demand source',
+                         data: { toggle: 'modal', target: "#delete-dod-source-#{dod_element.id}" }) do
+            %i.fas.fa-times-circle.text-danger
+          = render partial: 'edit_dod_source_modal', locals: { repository: repository, project: project, download_on_demand: dod_element }
+          = render partial: 'delete_dod_source_modal', locals: { repository: repository, project: project, download_on_demand: dod_element }
 .card-footer.text-center
   .row
-    .col
-      = link_to('#', title: 'Add DoD Source', data: { toggle: 'modal', target: "#add-dod-source-modal-#{repository.id}" }) do
-        %i.fas.fa-plus-circle.text-primary
     - if User.current.can_modify?(project)
+      .col
+        = link_to('#', title: 'Add DoD Source', data: { toggle: 'modal', target: "#add-dod-source-modal-#{repository.id}" }) do
+          %i.fas.fa-plus-circle.text-primary
       .col
         = link_to('#', title: 'Delete Repository', data: { toggle: 'modal', target: "#delete-repository-#{repository.id}" }) do
           %i.fas.fa-times-circle.text-danger
+    - elsif !User.current.is_nobody?
+      .col
+        = link_to('#', title: 'Request Delete Repository',
+                       data: { toggle: 'modal', target: "#request-delete-repository-#{repository.id}" }) do
+          %i.fas.fa-user-times.text-danger
 
 = render partial: 'add_dod_source_modal', locals: { repository: repository,
                                                     project: project,
                                                     download_on_demand: DownloadRepository.new(repository_id: repository.id) }
 = render partial: 'delete_repository_modal', locals: { repository: repository, project: project }
+= render partial: 'request_delete_repository_modal', locals: { repository: repository, project: project }
diff --git a/src/api/app/views/webui2/webui/repositories/_repository_card_content.html.haml b/src/api/app/views/webui2/webui/repositories/_repository_card_content.html.haml
@@ -18,7 +18,7 @@
 
 .card-footer.text-center
   .row
-    - if User.current.can_modify?(project) && !repository.is_dod_repository?
+    - if User.current.can_modify?(project)
       .col
         = link_to('#', title: 'Edit Repository',
                        data: { toggle: 'modal', target: "#edit-repository-#{repository.id}" }) do

diff --git a/src/api/app/views/webui2/webui/repositories/_repository_path_item.html.haml b/src/api/app/views/webui2/webui/repositories/_repository_path_item.html.haml
@@ -5,17 +5,18 @@
       Target repository has been removed
     - else
       #{path.link.project}/#{path.link.name}
-      - if repository.path_elements.size > 1
-        - unless path == repository.path_elements.first
-          = link_to(move_repository_path_path(project: project, repository: repository, path: path, direction: 'up'), method: :post,
-                    title: 'Move Up the Repository Path') do
-            %i.fas.fa-arrow-alt-circle-up.fa-lg.text-info
-        - unless path == repository.path_elements.last
-          = link_to(move_repository_path_path(project: project, repository: repository, path: path, direction: 'down'), method: :post,
-                    title: 'Move Down the Repository Path') do
-            %i.fas.fa-arrow-alt-circle-down.fa-lg.text-info
-      = link_to('#', title: "Delete '#{path.link.project}/#{path.link.name}' repository path",
-                 data: { toggle: 'modal', target: "#delete-path-#{path.id}" }) do
-        %i.fas.fa-times-circle.fa-lg.text-danger
+      - if User.current.can_modify?(project)
+        - if repository.path_elements.size > 1
+          - unless path == repository.path_elements.first
+            = link_to(move_repository_path_path(project: project, repository: repository, path: path, direction: 'up'), method: :post,
+                      title: 'Move Up the Repository Path') do
+              %i.fas.fa-arrow-alt-circle-up.fa-lg.text-info
+          - unless path == repository.path_elements.last
+            = link_to(move_repository_path_path(project: project, repository: repository, path: path, direction: 'down'), method: :post,
+                      title: 'Move Down the Repository Path') do
+              %i.fas.fa-arrow-alt-circle-down.fa-lg.text-info
+        = link_to('#', title: "Delete '#{path.link.project}/#{path.link.name}' repository path",
+                   data: { toggle: 'modal', target: "#delete-path-#{path.id}" }) do
+          %i.fas.fa-times-circle.fa-lg.text-danger
 
 = render partial: 'delete_repository_path_modal', locals: { repository: repository, project: project, path: path }