diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-06 15:13:47 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-06 15:13:47 +0200 |
| commit | 4ba26988101b502742a17cd47cc5634c28de2d03 (patch) | |
| tree | 15110df5869d68d5c91d0ac533ce9df1549c3087 | |
| parent | 7a9d432cdb84936bf8dd1359d363f42e6ebca542 (diff) | |
| download | gitlab-ce-4ba26988101b502742a17cd47cc5634c28de2d03.tar.gz | |
Remove selectbox from abuse form. Added pagination in admin area
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| -rw-r--r-- | app/views/abuse_reports/new.html.haml | 7 | ||||
| -rw-r--r-- | app/views/admin/abuse_reports/index.html.haml | 1 |
2 files changed, 3 insertions, 5 deletions
diff --git a/app/views/abuse_reports/new.html.haml b/app/views/abuse_reports/new.html.haml index 736456b67ba..26a569222b4 100644 --- a/app/views/abuse_reports/new.html.haml +++ b/app/views/abuse_reports/new.html.haml @@ -11,8 +11,8 @@ .form-group = f.label :user_id, class: 'control-label' .col-sm-10 - = users_select_tag("abuse_reports[user_id]", placeholder: 'Select user to report abuse', - class: 'custom-form-control js-select2', selected: @abuse_report.user_id, scope: :all) + - name = "#{@abuse_report.user.name} (@#{@abuse_report.user.username})" + = text_field_tag :user_name, name, class: "form-control", readonly: true .form-group = f.label :message, class: 'control-label' .col-sm-10 @@ -24,6 +24,3 @@ .form-actions = f.submit "Send report", class: "btn btn-create" - -:coffeescript - new UsersSelect() diff --git a/app/views/admin/abuse_reports/index.html.haml b/app/views/admin/abuse_reports/index.html.haml index a3c900e16aa..4a25848f156 100644 --- a/app/views/admin/abuse_reports/index.html.haml +++ b/app/views/admin/abuse_reports/index.html.haml @@ -12,5 +12,6 @@ %th %th = render @abuse_reports + = paginate @abuse_reports - else %h4 There are no abuse reports |