summaryrefslogtreecommitdiffstats
path: root/app.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app.rb')
-rw-r--r--app.rb13
1 files changed, 12 insertions, 1 deletions
diff --git a/app.rb b/app.rb
index 7ee7851..9e9cb9d 100644
--- a/app.rb
+++ b/app.rb
@@ -927,6 +927,11 @@ get '/admin/people/:uuid' do
.map { |k, v| { uuid: k, name: v['name'] || "(unnamed ยท #{(v['members'] || []).length})" } }
.sort_by { |x| x[:name].downcase }
+ @existing_names_json = regular
+ .select { |_, v| v['name'] }
+ .map { |k, v| { uuid: k, name: v['name'] } }
+ .to_json
+
erb :'admin/person_detail'
end
@@ -965,7 +970,13 @@ post '/admin/people/:uuid/move' do
data['people'] = people
atomic_write(PEOPLE_PATH, JSON.pretty_generate(data))
- people[src] ? redirect("/admin/people/#{src}") : redirect('/admin/people')
+ if to == 'new'
+ redirect "/admin/people/#{new_uid}"
+ elsif people[src]
+ redirect "/admin/people/#{src}"
+ else
+ redirect '/admin/people'
+ end
end
post '/admin/people/__pool__/blacklist_all' do