refactoring: move users/edit map to view hook #50

jkraemer · jkraemer · commit ff892ef16f86 · 2017-09-23T13:17:15.000+08:00
diff --git a/app/overrides/users.rb b/app/overrides/users.rb
@@ -1,11 +1,3 @@
-Deface::Override.new(
-  :virtual_path => "users/_form",
-  :name => "deface_view_users_form_map",
-  :insert_bottom => "div.splitcontentleft",
-  :partial => "users/form/map"
-)
-
-
 Deface::Override.new(
   :virtual_path => "users/show",
   :name => "deface_view_users_show_other_formats",
diff --git a/app/views/redmine_gtt/hooks/_user_map.html.erb b/app/views/redmine_gtt/hooks/_user_map.html.erb
@@ -0,0 +1,5 @@
+</fieldset>
+<fieldset class="box tabular">
+  <legend><%= l(:label_user_map) %></legend>
+  <%= map_form_field form, user.map, edit_mode: 'Point' %>
+
diff --git a/app/views/redmine_gtt/hooks/_view_my_account.html.erb b/app/views/redmine_gtt/hooks/_view_my_account.html.erb
@@ -1,5 +1,2 @@
-</fieldset>
-<fieldset class="box tabular">
-  <legend><%= l(:label_user_map) %></legend>
-  <%= map_form_field form, user.map, edit_mode: 'Point' %>
+<%= render partial: 'redmine_gtt/hooks/user_map', locals: { user: user, form: form } %>
 
diff --git a/app/views/redmine_gtt/hooks/_view_users_form.html.erb b/app/views/redmine_gtt/hooks/_view_users_form.html.erb
@@ -0,0 +1,2 @@
+<%= render partial: 'redmine_gtt/hooks/user_map', locals: { user: user, form: form } %>
+
diff --git a/lib/redmine_gtt/view_hooks.rb b/lib/redmine_gtt/view_hooks.rb
@@ -5,5 +5,8 @@ class ViewHooks < Redmine::Hook::ViewListener
 
     render_on :view_my_account,
       partial: 'redmine_gtt/hooks/view_my_account'
+
+    render_on :view_users_form,
+      partial: 'redmine_gtt/hooks/view_users_form'
   end
 end

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+<%= render partial: 'redmine_gtt/hooks/user_map', locals: { user: user, form: form } %>`
	`2`	`+`