Merge pull request #8284 from DavidKang/shared-path

Use correct path for partials in shared directory
openSUSE · Sep 6, 2019 · a17c94d · a17c94d
2 parents 559b951 + bfa8f2e
commit a17c94d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 12 deletions.
diff --git a/src/api/app/views/webui/shared/user_or_groups_roles/_add_group_dialog.html.haml b/src/api/app/views/webui/shared/user_or_groups_roles/_add_group_dialog.html.haml
@@ -5,12 +5,12 @@
         .modal-header
           %h5.modal-title#edit-modal-label Add Group
         .modal-body
-          = render partial: 'webui/autocomplete', locals: { html_id: 'groupid', label: 'Group:',
-                                                            data: { source: autocomplete_groups_path } }
+          = render partial: 'webui/shared/autocomplete', locals: { html_id: 'groupid', label: 'Group:',
+                                                                   data: { source: autocomplete_groups_path } }
           .form-group
             = label_tag(:role, 'Role:')
             = select_tag 'role', options_for_select(Role.local_roles, nil), required: true, class: 'form-control'
           = hidden_field_tag 'package', package
           = hidden_field_tag 'project', project
         .modal-footer
-          = render partial: 'webui2/shared/dialog_action_buttons'
+          = render partial: 'webui/shared/dialog_action_buttons'
diff --git a/src/api/app/views/webui/shared/user_or_groups_roles/_add_user_dialog.html.haml b/src/api/app/views/webui/shared/user_or_groups_roles/_add_user_dialog.html.haml
@@ -5,13 +5,12 @@
         .modal-header
           %h5.modal-title#edit-modal-label Add User
         .modal-body
-          = render partial: 'webui/autocomplete', locals: { html_id: 'userid', label: 'User:',
-                                                            data: { source: autocomplete_users_path } }
+          = render partial: 'webui/shared/autocomplete', locals: { html_id: 'userid', label: 'User:',
+                                                                   data: { source: autocomplete_users_path } }
           .form-group
             = label_tag(:role, 'Role:')
             = select_tag 'role', options_for_select(Role.local_roles, nil), required: true, class: 'form-control'
           = hidden_field_tag 'package', package
           = hidden_field_tag 'project', project
-          = hidden_field_tag 'webui2', true
         .modal-footer
-          = render partial: 'webui2/shared/dialog_action_buttons'
+          = render partial: 'webui/shared/dialog_action_buttons'
diff --git a/src/api/app/views/webui/shared/user_or_groups_roles/_index.html.haml b/src/api/app/views/webui/shared/user_or_groups_roles/_index.html.haml
@@ -23,19 +23,19 @@
             %td= role.title.capitalize
           %td
       %tbody
-        = render partial: 'webui2/shared/user_or_groups_roles/list',
+        = render partial: 'webui/shared/user_or_groups_roles/list',
                  locals: { records: users, roles: roles, type: 'user',
                            user_is_maintainer: user_is_maintainer,
                            project: project, package: package }
 
   - if user_is_maintainer
     %ul.list-inline
       %li.list-inline-item
-        = render(partial: 'webui2/shared/user_or_groups_roles/add_user_dialog', locals: { project: project.to_param, package: package.to_param })
+        = render(partial: 'webui/shared/user_or_groups_roles/add_user_dialog', locals: { project: project.to_param, package: package.to_param })
         = link_to('#', data: { toggle: 'modal', target: '#add-user-role-modal' }, id: 'add-user', class: 'nav-link') do
           %i.fas.fa-plus-circle.text-primary
           Add User
-        = render(partial: 'webui2/shared/user_or_groups_roles/delete_dialog')
+        = render(partial: 'webui/shared/user_or_groups_roles/delete_dialog')
 
   %hr
 
@@ -50,14 +50,14 @@
           - if user_is_maintainer
             %td
       %tbody
-        = render partial: 'webui2/shared/user_or_groups_roles/list',
+        = render partial: 'webui/shared/user_or_groups_roles/list',
                  locals: { records: groups, roles: roles, type: 'group',
                            user_is_maintainer: user_is_maintainer,
                            project: project, package: package }
   - if user_is_maintainer
     %ul.list-inline
       %li.list-inline-item
-        = render(partial: 'webui2/shared/user_or_groups_roles/add_group_dialog', locals: { project: project.to_param, package: package.to_param })
+        = render(partial: 'webui/shared/user_or_groups_roles/add_group_dialog', locals: { project: project.to_param, package: package.to_param })
         = link_to('#', data: { toggle: 'modal', target: '#add-group-role-modal' }, id: 'add-group', class: 'nav-link') do
           %i.fas.fa-plus-circle.text-primary
           Add Group