refactoring: move my/account map to view hook #50

Author: jkraemer

app/overrides/users.rb

@@ -1,10 +1,3 @@
-Deface::Override.new(
-  :virtual_path => "my/account",
-  :name => "deface_view_users_account_map",
-  :insert_after => "div.splitcontentleft fieldset.box",
-  :partial => "users/form/map"
-)
-
 Deface::Override.new(
   :virtual_path => "users/_form",
   :name => "deface_view_users_form_map",

app/views/redmine_gtt/hooks/_view_my_account.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' %>
+

lib/redmine_gtt.rb

@@ -33,11 +33,10 @@ def self.setup
     RedmineGtt::Patches::ProjectsHelperPatch.apply
     RedmineGtt::Patches::UsersControllerPatch.apply
 
-    ProjectsController.class_eval do
-      helper 'gtt_map'
-    end
-    UsersController.class_eval do
-      helper 'gtt_map'
+    [ ProjectsController, MyController, UsersController ].each do |c|
+      c.class_eval do
+        helper 'gtt_map'
+      end
     end
 
     # unless IssueQuery.included_modules.include?(RedmineGtt::Patches::IssueQueryPatch)

lib/redmine_gtt/patches/user_patch.rb

@@ -7,7 +7,7 @@ def self.apply
           User.prepend GeojsonAttribute
           User.prepend self
           User.class_eval do
-            safe_attributes "geom"
+            safe_attributes "geojson"
           end
         end
       end

lib/redmine_gtt/view_hooks.rb

@@ -2,5 +2,8 @@ module RedmineGtt
   class ViewHooks < Redmine::Hook::ViewListener
     render_on :view_account_left_bottom,
       partial: 'redmine_gtt/hooks/view_account_left_bottom'
+
+    render_on :view_my_account,
+      partial: 'redmine_gtt/hooks/view_my_account'
   end
 end