summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-08-06 15:13:47 +0200
committerValery Sizov <vsv2711@gmail.com>2015-08-07 10:10:19 +0300
commit8b7a2690088a3f3822d905a5d66dd72bceb8c4bb (patch)
tree910ece464d0ea8fdb3d44ae14d7eb5d1b0a9537f
parent3dc13281ee7856966f1ca0c208ab291a78c5e6ec (diff)
downloadgitlab-ce-8b7a2690088a3f3822d905a5d66dd72bceb8c4bb.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.haml7
-rw-r--r--app/views/admin/abuse_reports/index.html.haml1
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