treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Added e-mail edit field to settings, proper format default for webfinger

remotes/1727458204337373841/tmp_refs/heads/signup-info-prompt
Eugen Rochko 2016-10-18 03:34:26 +02:00
parent d5e086a47b
commit 2e0a38d07c
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/xrd_controller.rb
View File

@ -1,4 +1,6 @@
class XrdController < ApplicationController class XrdController < ApplicationController
before_action :set_default_format
def host_meta def host_meta
@webfinger_template = "#{webfinger_url}?resource={uri}" @webfinger_template = "#{webfinger_url}?resource={uri}"
@ -22,6 +24,10 @@ class XrdController < ApplicationController
private private
def set_default_format
request.format = 'json' if request.headers["HTTP_ACCEPT"].nil? && params[:format].nil?
end
def username_from_resource def username_from_resource
if resource_param.start_with?('acct:') || resource_param.include?('@') if resource_param.start_with?('acct:') || resource_param.include?('@')
resource_param.split('@').first.gsub('acct:', '') resource_param.split('@').first.gsub('acct:', '')

2
app/views/auth/registrations/edit.html.haml
View File

@ -4,6 +4,8 @@
= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| = form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f|
= devise_error_messages! = devise_error_messages!
.field
= f.email_field :email, placeholder: 'E-mail address'
.field .field
= f.password_field :password, autocomplete: "off", placeholder: 'New password' = f.password_field :password, autocomplete: "off", placeholder: 'New password'
.field .field