Merge pull request #72 from projekteuler/show_users

Show users

app/controllers/translations_controller.rb

@@ -13,6 +13,9 @@ class TranslationsController < ApplicationController
   # POST /translations
   def create
     @translation = @problem.translations.new(translation_params)
+    if user_signed_in?
+      @translation.author = current_user
+    end
     if @translation.save
       redirect_to @problem, notice: t('translations.notice.successfully_created')
     else

app/models/problem.rb

@@ -4,7 +4,8 @@ class Problem < ApplicationRecord
   delegate :title, :content, to: :translation
 
   has_many :translations, inverse_of: :problem
-  
+  has_many :authors, -> { where(translations: { status: [:in_use, :outdated] }).distinct }, through: :translations
+
   self.per_page = 50
 
   def is_translated?
@@ -19,6 +20,10 @@ class Problem < ApplicationRecord
     self.translation.in_use!
   end
 
+  def has_anonymous_author?
+    translations.where(status: [:in_use, :outdated], author: nil).any?
+  end
+
   def original_url
     "https://projecteuler.net/problem=#{self.id}"
   end

app/models/translation.rb

@@ -1,5 +1,6 @@
 class Translation < ApplicationRecord
   belongs_to :problem, inverse_of: :translations
+  belongs_to :author, class_name: 'User', inverse_of: :translations, optional: true
   enum status: [:pending, :in_use, :outdated, :declined]
 
   validates :title, :content, :problem_id, presence: true
@@ -7,6 +8,10 @@ class Translation < ApplicationRecord
 
   self.per_page = 50
 
+  def has_author?
+    !!self.author
+  end
+
   def title_is_unique_among_other_problems
     Problem.includes(:translation).where.not(id: problem_id).each do |problem|
       if problem.is_translated? and problem.title == title

app/models/user.rb

@@ -2,6 +2,7 @@ class User < ApplicationRecord
   devise :omniauthable, :rememberable
 
   enum role: [:user, :admin]
+  has_many :translations, inverse_of: :author, dependent: :nullify
 
   def self.from_omniauth(auth)
     where(provider: auth.provider, uid: auth.uid).first_or_create do |user|

app/views/admin/translations/index.html.erb

@@ -7,6 +7,7 @@
   <thead>
     <tr>
       <th><%= Translation.human_attribute_name(:created_at) %></th>
+      <th><%= Translation.human_attribute_name(:author) %></th>
       <th><%= Translation.human_attribute_name(:problem_id) %></th>
       <th><%= Translation.human_attribute_name(:title) %></th>
     </tr>
@@ -16,6 +17,13 @@
     <% @translations.each do |translation| %>
       <tr>
         <td><div data-toggle="tooltip" data-placement="left" title="<%= l translation.created_at %>"><%= time_ago_in_words(translation.created_at) %></div></td>
+        <td>
+          <% if translation.has_author? %>
+            <%= translation.author.name %>
+          <% else %>
+            <i><%= t('.anonymous') %></i>
+          <% end %>
+        </td>
         <td><%= translation.problem_id %></td>
         <td><%= link_to translation.title, [:admin, translation] %></td>
       </tr>

app/views/admin/translations/show.html.erb

@@ -1,6 +1,9 @@
 <% provide(:title, t('problems.show.problem_subtitle', id: @translation.problem_id)) %>
 
 <div class="page-header">
+  <p class="text-muted">
+    <%= render 'shared/authors', authors: Array(@translation.author) %>
+  </p>
   <h1><%= @translation.title %> <small><%= t 'problems.show.problem_subtitle', id: @translation.problem_id %></small></h1>
 </div>
 

app/views/layouts/_header.html.erb

@@ -8,6 +8,9 @@
             <%= link_to Problem.model_name.human(count: 2), problems_path %>
             <% if user_signed_in? and current_user.admin? %>
                 <%= link_to t('admin.dashboard.index.administration'), admin_dashboard_index_path %>
+                <%= link_to admin_translations_path do %>
+                  <%= t('admin.dashboard.index.translations') %> <span class="badge"><%= Translation.pending.count %></span>
+                <% end %>
             <% end %>
         <% end %>
         <%= nav class: 'navbar-right' do %>

app/views/problems/show.html.erb

@@ -1,6 +1,9 @@
 <% provide(:title, t('problems.show.problem_subtitle', id: @problem.id)) %>
 
 <div class="page-header">
+  <p class="text-muted">
+    <%= render 'shared/authors', authors: @problem.authors, has_anonymous_author: @problem.has_anonymous_author? %>
+  </p>
   <h1><%= @problem.title %> <small><%= t '.problem_subtitle', id: @problem.id %></small></h1>
 </div>
 <%= link_to new_problem_translation_path(@problem), class: 'btn btn-default btn-sm pull-right' do %>

app/views/shared/_authors.de.html.erb

@@ -0,0 +1,11 @@
+<% if authors.empty? %>
+  Diese Übersetung wurde anonym erstellt.
+<% else %>
+  Diese Übersetzung wurde von
+  <% if local_assigns[:has_anonymous_author] %>
+    <%= (authors.map(&:name)+Array("anonymen Nutzern")).to_sentence %>
+  <% else %>
+    <%= authors.map(&:name).to_sentence %>
+  <% end %>
+   erstellt.
+<% end %>

app/views/translations/_form.html.erb

@@ -13,5 +13,11 @@
       </div>
     <% end %>
   </div>
+  <div class="alert alert-info">
+    <%= t '.copyright_warning_html' %>
+    <% if not user_signed_in? %>
+      <%= t '.not_logged_in_warning' %>
+    <% end %>
+  </div>
   <%= f.submit %>
 <% end %>

config/locales/models/translation/de.yml

@@ -11,4 +11,5 @@ de:
         id: ID
         problem_id: Problem-ID
         title: Titel
-        content: Inhalt
+        content: Inhalt
+        author: Autor

config/locales/views/admin/de.yml

@@ -3,6 +3,7 @@ de:
     dashboard:
       index:
         administration: "Administration"
+        translations: "Übersetzungen"
         view_translations: "Übersetzungen anschauen"
         update_problem_count: "Problem-Anzahl aktualisieren"
         update: "Aktualisieren"
@@ -11,6 +12,8 @@ de:
         failure_message: "Problem-Anzahl konnte nicht aktualisiert werden! Grund: %{error}"
         no_problem_count: "Keine Problem-Anzahl gegeben!"
     translations:
+      index:
+        anonymous: "Anonym"
       must_be_pending: "Übersetzung muss ausstehend sein, um akzeptiert oder abgelehnt zu werden!"
       show:
         accept_translation: "Akzeptieren"

config/locales/views/translations/de.yml

@@ -6,6 +6,8 @@ de:
       preview: Vorschau
       source_code: Quelltext
       translation_source_explanation: Hier kommt der HTML-Quelltext der Übersetzung hin.
+      copyright_warning_html: Sie erklären sich einverstanden, dass die Übersetzung unter der Creative Commons Lizenz <a class="alert-link" href="https://creativecommons.org/licenses/by-nc-sa/4.0/deed.de" target="_blank">CC BY-NC-SA 4.0</a> veröffentlicht wird.
+      not_logged_in_warning: Wenn Sie wollen, dass die Übersetzung Ihnen zugeordnet werden kann, müssen Sie sich einloggen (oben rechts), andernfalls ist sie anonym.
     new:
       new_translation: Neue Übersetzung für Problem %{id}
     notice:

db/migrate/20190204164033_add_author_to_translations.rb

@@ -0,0 +1,5 @@
+class AddAuthorToTranslations < ActiveRecord::Migration[5.2]
+  def change
+    add_reference :translations, :author, index: true, null: true, foreign_key: {to_table: :users}
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2019_02_03_164629) do
+ActiveRecord::Schema.define(version: 2019_02_04_164033) do
 
   create_table "problems", force: :cascade do |t|
     t.datetime "created_at"
@@ -26,6 +26,8 @@ ActiveRecord::Schema.define(version: 2019_02_03_164629) do
     t.datetime "updated_at"
     t.integer "problem_id"
     t.integer "status", default: 0
+    t.integer "author_id"
+    t.index ["author_id"], name: "index_translations_on_author_id"
     t.index ["problem_id"], name: "index_translations_on_problem_id"
   end
 

test/controllers/translations_controller_test.rb

@@ -22,7 +22,7 @@ class TranslationsControllerTest < ActionDispatch::IntegrationTest
     assert_response :success
   end
 
-  test "should create translation" do
+  test "should create translation anonymously" do
     assert_difference('Translation.count') do
       post problem_translations_url(problem_id: 1, translation: @update)
     end
@@ -30,6 +30,16 @@ class TranslationsControllerTest < ActionDispatch::IntegrationTest
     assert_redirected_to problem_path(id: 1)
   end
 
+  test "should create translation with user" do
+    login_translator
+    assert_difference('Translation.count') do
+      post problem_translations_url(problem_id: 1, translation: @update)
+    end
+
+    assert_redirected_to problem_path(id: 1)
+    assert_equal users(:translator), Translation.last.author
+  end
+
   test "should not create incorrect translation" do
     assert_no_difference('Translation.count') do
       post problem_translations_url(problem_id: 1, translation: @incorrect)

test/test_helper.rb

@@ -10,6 +10,12 @@ class ActiveSupport::TestCase
   fixtures :all
 
   # Add more helper methods to be used by all tests here...
+end
+
+
+class ActionDispatch::IntegrationTest
+  include Devise::Test::IntegrationHelpers
+
   def login_admin
     admin = users(:admin)
     sign_in admin
@@ -19,10 +25,7 @@ class ActiveSupport::TestCase
     translator = users(:translator)
     sign_in translator
   end
-end
 
-
-class ActionDispatch::IntegrationTest
   OmniAuth.config.test_mode = true
   OmniAuth.config.mock_auth[:github] = OmniAuth::AuthHash.new({
       provider: :github,