]> git.openstreetmap.org Git - rails.git/commitdiff
projects / rails.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a566589)
Rename id_oauth_application to id_application in settings
authorTom Hughes <tom@compton.nu>
Wed, 8 Jun 2022 12:28:07 +0000 (13:28 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 8 Jun 2022 12:28:07 +0000 (13:28 +0100)
CONFIGURE.md patch | blob | history
app/views/site/_id.html.erb patch | blob | history
app/views/site/id.html.erb patch | blob | history
config/settings.yml patch | blob | history

diff --git a/CONFIGURE.md b/CONFIGURE.md
index ed06ff3e5ce274684b9b488044b1d57de89836f2..fdaea0e8342b9706f78b36586b8f7fa46decc9fc 100644 (file)
--- a/CONFIGURE.md
+++ b/CONFIGURE.md
@@ -73,7 +73,7 @@ For iD, do the following:
   * 'Modify notes'
 * On the next page, copy the "Client ID"
 * Edit config/settings.local.yml in your rails tree
   * 'Modify notes'
 * On the next page, copy the "Client ID"
 * Edit config/settings.local.yml in your rails tree
-* Add the "id_oauth_application" configuration with the "Client ID" as the value
+* Add the "id_application" configuration with the "Client ID" as the value
 * Restart your rails server
 
 An example excerpt from settings.local.yml:
 * Restart your rails server
 
 An example excerpt from settings.local.yml:
@@ -82,7 +82,7 @@ An example excerpt from settings.local.yml:
 # Default editor
 default_editor: "id"
 # OAuth 2 Client ID for iD
 # Default editor
 default_editor: "id"
 # OAuth 2 Client ID for iD
-id_oauth_application: "Snv…OA0"
+id_application: "Snv…OA0"
 ```
 
 To allow [Notes](https://wiki.openstreetmap.org/wiki/Notes) and changeset discussions to work, follow a similar process, this time registering an OAuth 2 application for the web site:
 ```
 
 To allow [Notes](https://wiki.openstreetmap.org/wiki/Notes) and changeset discussions to work, follow a similar process, this time registering an OAuth 2 application for the web site:
diff --git a/app/views/site/_id.html.erb b/app/views/site/_id.html.erb
index 4f764860e15badbef26f3ff159545131ffaf4379..c0ea3631b35a11d7b99068f33c69a23c170622f9 100644 (file)
--- a/app/views/site/_id.html.erb
+++ b/app/views/site/_id.html.erb
@@ -1,7 +1,7 @@
 <%= javascript_include_tag "edit/id" %>
 
 <div id="map">
 <%= javascript_include_tag "edit/id" %>
 
 <div id="map">
-  <% data = { :configured => Settings.key?(:id_oauth_application) }
+  <% data = { :configured => Settings.key?(:id_application) }
      data[:lat] = @lat if @lat
      data[:lon] = @lon if @lon
      data[:gpx] = trace_data_url(params[:gpx], :format => :xml) if params[:gpx]
      data[:lat] = @lat if @lat
      data[:lon] = @lon if @lon
      data[:gpx] = trace_data_url(params[:gpx], :format => :xml) if params[:gpx]
diff --git a/app/views/site/id.html.erb b/app/views/site/id.html.erb
index 63792ab5a5aac6f6a344ab7cafb9fc9b1641f3fa..64cb4fd58e84be24042079846fb0364899454b72 100644 (file)
--- a/app/views/site/id.html.erb
+++ b/app/views/site/id.html.erb
@@ -9,8 +9,8 @@
 </head>
 <body>
 <% data = {}
 </head>
 <body>
 <% data = {}
-   if Settings.key?(:id_oauth_application)
-     token = current_user.oauth_token(Settings.id_oauth_application)
+   if Settings.key?(:id_application)
+     token = current_user.oauth_token(Settings.id_application)
      data[:token] = token.token
    end
    data[:locale] = ID::LOCALES.preferred(preferred_languages).to_s
      data[:token] = token.token
    end
    data[:locale] = ID::LOCALES.preferred(preferred_languages).to_s
diff --git a/config/settings.yml b/config/settings.yml
index 44e3cb7011ab7bf78f14989403cb5aae774c4a15..e8db6f81818653993c1d98577b8b863ef133c089 100644 (file)
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -81,8 +81,8 @@ nominatim_url: "https://nominatim.openstreetmap.org/"
 default_editor: "id"
 # OAuth application for the web site
 #oauth_application: ""
 default_editor: "id"
 # OAuth application for the web site
 #oauth_application: ""
-# OAuth consumer key for iD
-#id_oauth_application: ""
+# OAuth application for iD
+#id_application: ""
 # Imagery to return in capabilities as blacklisted
 imagery_blacklist:
   # Current Google imagery URLs have google or googleapis in the domain
 # Imagery to return in capabilities as blacklisted
 imagery_blacklist:
   # Current Google imagery URLs have google or googleapis in the domain
The OpenStreetMap web site