lib/hippo/user.rb in hippo-fw-0.9.7 vs lib/hippo/user.rb in hippo-fw-0.9.8

@@ -21,18 +21,19 @@
         def roles
             @cached_roles ||= Access::RoleCollection.new(self)
         end
 
         def workspace_data
-            my_data = attributes.slice('id','login','name','email','created_at',
-                                       'created_by','updated_at','updated_by','role_names', 'options')
-
-            Hippo::SystemSettings
-                .public_json
-                .merge(
-                    user: my_data, access: Access.for_user(self), access_token: jwt_token,
-                    screen_ids: Hippo::Screen.active_ids,
-                )
+            user_data = attributes.slice(
+                'id','login','name','email', 'role_names', 'options',
+                'created_at','created_by','updated_at', 'updated_by'
+            )
+            {
+                user: user_data,
+                access: Access.for_user(self),
+                access_token: jwt_token,
+                screen_ids: Hippo::Screen.active_ids,
+            }
         end
 
         # @param model [Hippo::Model]
         # @param attribute [Symbol]
         # @return [Boolean] Can the User view the model?