Skip to content

Commit ee0adbd

Browse files
committed
Add user priority attribuet
1 parent 2e66dfd commit ee0adbd

File tree

25 files changed

+351
-90
lines changed

25 files changed

+351
-90
lines changed

app/controllers/api/v1/users.rb

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ class Users < Grape::API
7979
optional :linkedin, type: String, desc: "Users Linkedin username"
8080
optional :language, type: String, desc: "Users prefered language"
8181
optional :active, type: Boolean, desc: "User active or deactivated", default: true
82+
optional :priority, type: String, desc: "Users Priority", values: ['low', 'normal', 'high', 'vip'], default: 'normal'
8283
end
8384
post "", root: :users do
8485
user = User.create!(
@@ -103,7 +104,8 @@ class Users < Grape::API
103104
twitter: permitted_params[:twitter],
104105
linkedin: permitted_params[:linkedin],
105106
language: permitted_params[:language],
106-
active: permitted_params[:active]
107+
active: permitted_params[:active],
108+
priority: permitted_params[:priority]
107109
)
108110
present user, with: Entity::User
109111
end
@@ -137,6 +139,7 @@ class Users < Grape::API
137139
optional :linkedin, type: String, desc: "Users Linkedin username"
138140
optional :language, type: String, desc: "Users prefered language"
139141
optional :active, type: Boolean, desc: "User active or deactivated"
142+
optional :priority, type: String, desc: "Users Priority- low, normal, high or vip", default: 'normal'
140143
end
141144
patch ":id", root: :users do
142145
user = User.where(id: permitted_params[:id]).first
@@ -162,7 +165,8 @@ class Users < Grape::API
162165
twitter: permitted_params[:twitter],
163166
linkedin: permitted_params[:linkedin],
164167
language: permitted_params[:language],
165-
active: permitted_params[:active]
168+
active: permitted_params[:active],
169+
priority: permitted_params[:priority]
166170
)
167171
present user, with: Entity::User
168172
end

app/models/entity/user.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,6 @@ class User < Base
3131
expose :sign_in_count, documentation: { type: "Integer" }
3232
expose :team_list
3333
expose :account_number
34+
expose :priority
3435
end
3536
end

app/views/admin/users/_edit.html.erb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<%#= @topic.user.country.titleize unless @topic.user.country.nil? %>
1111
<%= f.select(:role, [[t('select_role'),''],[t('admin_role'),'admin'],[t('agent_role'),'agent'],[t('editor_role'),'editor'],[t('user_role'),'user']]) if current_user.is_admin? %>
1212
<%= f.text_field :team_list, value: @user.team_list.to_s, class: 'selectize form-control', label: "Group Membership" if AppSettings['settings.teams'] && current_user.is_admin? && @user.is_agent? %>
13+
<%= f.select(:priority, [[t('select_priority'),'Select Priority'],[t('low_priority'),'low'],[t('normal_priority'),'normal'],[t('high_priority'),'high'],[t('vip_priority'),'vip']]) if current_user.is_admin? %>
1314
<%= f.check_box :active %> <%#= f.check_box :admin, inline: true %>
1415
</div>
1516
<div class="user-section">

config/locales/ca.yml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,10 @@ ca:
8383
# version: "Version:"
8484

8585
# flag
86-
#flag_for_review:
87-
#flag_post_for_review:
86+
#flag_for_review:
87+
#flag_post_for_review:
8888
#flag_post_placeholder:
89-
#flag:
89+
#flag:
9090

9191
# devise/sessions/new
9292
login: Iniciar sessió
@@ -161,6 +161,13 @@ ca:
161161
work_phone: feina
162162
cell_phone: mòbil
163163

164+
# Priorities
165+
# select_priority: Select Priority
166+
# vip_priority: VIP
167+
# high_priority: High
168+
# normal_priority: Normal
169+
# low_priority: Low
170+
164171
# User search results
165172
users_found:
166173
one: "1 usuari trobat amb nom %{query}"
@@ -329,4 +336,4 @@ ca:
329336
million: M
330337
billion: B
331338
trillion: T
332-
quadrillion: Q
339+
quadrillion: Q

config/locales/de.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,10 @@ de:
8383
version: "Version:"
8484

8585
# flag
86-
#flag_for_review:
87-
#flag_post_for_review:
86+
#flag_for_review:
87+
#flag_post_for_review:
8888
#flag_post_placeholder:
89-
#flag:
89+
#flag:
9090

9191
# devise/sessions/new
9292
login: Anmelden
@@ -161,6 +161,13 @@ de:
161161
work_phone: Arbeit
162162
cell_phone: Handy
163163

164+
# Priorities
165+
# select_priority: Select Priority
166+
# vip_priority: VIP
167+
# high_priority: High
168+
# normal_priority: Normal
169+
# low_priority: Low
170+
164171
# User search results
165172
users_found:
166173
one: "1 Benutzer mit dem Namen %{query} wurde gefunden"

config/locales/en.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,13 @@ en:
164164
work_phone: work
165165
cell_phone: cell
166166

167+
# Priorities
168+
select_priority: Select Priority
169+
vip_priority: VIP
170+
high_priority: High
171+
normal_priority: Normal
172+
low_priority: Low
173+
167174
# Roles
168175
select_role: Select Role
169176
admin_role: Admin

config/locales/es.yml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,10 @@ es:
8383
version: "Versión:"
8484

8585
# flag
86-
#flag_for_review:
87-
#flag_post_for_review:
86+
#flag_for_review:
87+
#flag_post_for_review:
8888
#flag_post_placeholder:
89-
#flag:
89+
#flag:
9090

9191
# devise/sessions/new
9292
login: Iniciar sesión
@@ -161,6 +161,13 @@ es:
161161
work_phone: trabajo
162162
cell_phone: móvil
163163

164+
# Priorities
165+
# select_priority: Select Priority
166+
# vip_priority: VIP
167+
# high_priority: High
168+
# normal_priority: Normal
169+
# low_priority: Low
170+
164171
# User search results
165172
users_found:
166173
one: "1 usuario encontrado con nombre %{query}"
@@ -330,4 +337,4 @@ es:
330337
million: M
331338
billion: B
332339
trillion: T
333-
quadrillion: Q
340+
quadrillion: Q

config/locales/et.yml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,10 @@ et:
8080
# version: "Version:"
8181

8282
# flag
83-
#flag_for_review:
84-
#flag_post_for_review:
83+
#flag_for_review:
84+
#flag_post_for_review:
8585
#flag_post_placeholder:
86-
#flag:
86+
#flag:
8787

8888
# Profile
8989
my_profile: 'Minu profiil'
@@ -161,6 +161,13 @@ et:
161161
work_phone: töö
162162
cell_phone: telefon
163163

164+
# Priorities
165+
# select_priority: Select Priority
166+
# vip_priority: VIP
167+
# high_priority: High
168+
# normal_priority: Normal
169+
# low_priority: Low
170+
164171
# User search results
165172
users_found:
166173
one: "1 kasutaja leitud %{query}"
@@ -323,4 +330,4 @@ et:
323330
million: M
324331
billion: B
325332
trillion: T
326-
quadrillion: Q
333+
quadrillion: Q

config/locales/fa.yml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,10 @@ fa:
8383
version: "نسخه:"
8484

8585
# flag
86-
#flag_for_review:
87-
#flag_post_for_review:
86+
#flag_for_review:
87+
#flag_post_for_review:
8888
#flag_post_placeholder:
89-
#flag:
89+
#flag:
9090

9191
# devise/sessions/new
9292
login: ورود
@@ -161,6 +161,13 @@ fa:
161161
work_phone: تلفن دفتر
162162
cell_phone: موبایل
163163

164+
# Priorities
165+
# select_priority: Select Priority
166+
# vip_priority: VIP
167+
# high_priority: High
168+
# normal_priority: Normal
169+
# low_priority: Low
170+
164171
# User search results
165172
users_found:
166173
one: "۱ کاربر با اسم %{query} پیدا شد"
@@ -375,4 +382,4 @@ fa:
375382
million: M
376383
billion: B
377384
trillion: T
378-
quadrillion: Q
385+
quadrillion: Q

config/locales/fr.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,10 @@ fr:
8383
# version: "Version:"
8484

8585
# flag
86-
#flag_for_review:
87-
#flag_post_for_review:
86+
#flag_for_review:
87+
#flag_post_for_review:
8888
#flag_post_placeholder:
89-
#flag:
89+
#flag:
9090

9191
# devise/sessions/new
9292
login: Connexion
@@ -161,6 +161,13 @@ fr:
161161
work_phone: téléphone professionnel
162162
cell_phone: portable
163163

164+
# Priorities
165+
# select_priority: Select Priority
166+
# vip_priority: VIP
167+
# high_priority: High
168+
# normal_priority: Normal
169+
# low_priority: Low
170+
164171
# User search results
165172
users_found:
166173
one: "1 utilisateur nommé %{query} a été trouvé"

0 commit comments

Comments
 (0)