Merge pull request #13685 from rubhanazeem/clarify-reviewer-meaning

Clarify the meaning of different reviewer types
openSUSE · Jan 17, 2023 · d6b201d · d6b201d
2 parents ace75a3 + 0b68af4
commit d6b201d
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/src/api/app/assets/javascripts/webui/request.js b/src/api/app/assets/javascripts/webui/request.js
@@ -103,6 +103,19 @@ function requestAddAutocomplete(autocompleteElement) { // jshint ignore:line
     $('.hideable input:not(:visible)').attr('disabled', true);
 
     var selected = $(autocompleteElement+' option:selected').attr('value');
+    var reviewerMeaning = '';
+    if(selected === 'review-user') {
+      reviewerMeaning = 'The review will be requested from the selected user';
+    } else if(selected === 'review-group') {
+      reviewerMeaning = 'Any member of the selected group can review the request';
+    } else if(selected === 'review-project') {
+      reviewerMeaning = 'Any maintainer of the selected project can review the request';
+    } else if(selected === 'review-package') {
+      reviewerMeaning = 'Any maintainer of the project or package can review the request';
+    }
+
+    $('#reviewer-meaning').html(reviewerMeaning);
+
     $('.' + selected).removeClass('d-none');
     $('.hideable input:visible').removeAttr('disabled');
     if ($('#review_package').is(':visible') && !$('#review_project').val()) {

diff --git a/src/api/app/views/webui/request/_add_reviewer_dialog.html.haml b/src/api/app/views/webui/request/_add_reviewer_dialog.html.haml
@@ -7,9 +7,12 @@
         .modal-body
           = hidden_field_tag(:number, params['number'])
           .mb-3
-            = label_tag(:review_type, 'Type:')
-            = select_tag(:review_type, options_for_select([%w[User review-user], %w[Group review-group],
-                                                           %w[Project review-project], %w[Package review-package]]), class: 'form-select')
+            = label_tag(:review_type, 'Request review from:')
+            = select_tag(:review_type, options_for_select([['User', 'review-user'], ['Group Members', 'review-group'],
+                                                           ['Project Maintainers', 'review-project'], ['Package Maintainers', 'review-package']]),
+                                                           class: 'form-select')
+            %p.text-wrap.mt-1#reviewer-meaning
+              The review will be requested from the selected user
           .hideable.review-user
             = render partial: 'webui/shared/autocomplete', locals: { html_id: 'review_user', label: 'User:', required: true,
                                                                      data: { source: autocomplete_users_path } }