summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorazul <azul@riseup.net>2017-10-21 08:06:26 +0000
committerazul <azul@riseup.net>2017-10-21 08:06:26 +0000
commit92c5e35ea50a9d64f89d56454eff3e3103c17dc2 (patch)
treeb30e6372edca16a2fb15696bbe6a497468aa8887
parent3cf07b870cf5fa20714dadec38680876b0657108 (diff)
parent47df0b296b282d0fe554c3b596b366c5403c9588 (diff)
Merge branch 'feat/8806-sort-invite-codes' into 'master'
feat: sort invite codes by last update Closes #8806 See merge request leap/webapp!48
-rw-r--r--app/controllers/invite_codes_controller.rb4
-rw-r--r--app/models/invite_code.rb2
-rw-r--r--app/views/invite_codes/_invite_code.html.haml2
-rw-r--r--app/views/invite_codes/index.html.haml4
4 files changed, 9 insertions, 3 deletions
diff --git a/app/controllers/invite_codes_controller.rb b/app/controllers/invite_codes_controller.rb
index 6a7fef3..96836ee 100644
--- a/app/controllers/invite_codes_controller.rb
+++ b/app/controllers/invite_codes_controller.rb
@@ -7,7 +7,9 @@ class InviteCodesController < ApplicationController
def index
@invite = InviteCode.new # for the creation form.
- @invites = InviteCode.all.page(params[:page]).per(APP_CONFIG[:pagination_size])
+ @invites = InviteCode.by_updated_at.descending.
+ page(params[:page]).
+ per(APP_CONFIG[:pagination_size])
respond_with @invites
end
diff --git a/app/models/invite_code.rb b/app/models/invite_code.rb
index 9c6df66..8a56484 100644
--- a/app/models/invite_code.rb
+++ b/app/models/invite_code.rb
@@ -12,6 +12,8 @@ class InviteCode < CouchRest::Model::Base
design do
view :by_invite_code
view :by_invite_count
+ view :by_created_at
+ view :by_updated_at
end
def initialize(attributes = {}, options = {})
diff --git a/app/views/invite_codes/_invite_code.html.haml b/app/views/invite_codes/_invite_code.html.haml
index a3c420d..a167432 100644
--- a/app/views/invite_codes/_invite_code.html.haml
+++ b/app/views/invite_codes/_invite_code.html.haml
@@ -1,5 +1,7 @@
%tr
%td
+ = simple_date(invite_code.updated_at)
+ %td
= simple_date(invite_code.created_at)
%td
%input.invite-code{:value => invite_code.invite_code}
diff --git a/app/views/invite_codes/index.html.haml b/app/views/invite_codes/index.html.haml
index 40fccdf..98c49c7 100644
--- a/app/views/invite_codes/index.html.haml
+++ b/app/views/invite_codes/index.html.haml
@@ -11,10 +11,10 @@
%td= f.text_field :max_uses, style: 'width: 4em'
%td= f.submit t("helpers.submit.invites.create"), style: 'margin-bottom: 10px', class: 'btn btn-default'
-= table @invites, %w(created code uses actions)
+= table @invites, %w(updated created code uses actions)
-# select the text of the invite code when you click on it:
:javascript
$("input.invite-code").focus(function(){
this.select();
- }); \ No newline at end of file
+ });