Add missing locales and fix access to public pages

This commit is contained in:
Sebastian Serth
2020-05-06 11:27:09 +02:00
parent 99979eeb4f
commit 4c571c4fb2
5 changed files with 14 additions and 8 deletions

View File

@ -1,3 +1,5 @@
# frozen_string_literal: true
class InternalUsersController < ApplicationController
include CommonBehavior
@ -5,7 +7,7 @@ class InternalUsersController < ApplicationController
before_action :require_reset_password_token, only: :reset_password
before_action :set_user, only: MEMBER_ACTIONS
skip_before_action :verify_authenticity_token, only: :activate
skip_after_action :verify_authorized, only: [:activate, :forgot_password, :reset_password]
after_action :verify_authorized, except: %i[activate forgot_password reset_password]
def activate
set_up_password if request.patch? || request.put?
@ -48,8 +50,7 @@ class InternalUsersController < ApplicationController
destroy_and_respond(object: @user)
end
def edit
end
def edit; end
def forgot_password
if request.get?
@ -119,8 +120,7 @@ class InternalUsersController < ApplicationController
end
private :set_user
def show
end
def show; end
def update
update_and_respond(object: @user, params: internal_user_params)

View File

@ -5,9 +5,9 @@
- if object
- current_element = object
- else
- root_element = link_to_if(policy(model).index?, model.model_name.human(count: 2), send(:"#{model.model_name.collection}_path"))
- root_element = link_to_if(@current_user && policy(model).index?, model.model_name.human(count: 2), send(:"#{model.model_name.collection}_path"))
- if object
- current_element = link_to_if(policy(object).show?, object, send(:"#{model.model_name.singular}_path", object))
- current_element = link_to_if(@current_user && policy(object).show?, object, send(:"#{model.model_name.singular}_path", object))
- if I18n.translation_present?("shared.#{params[:action]}")
- active_action = t("shared.#{params[:action]}")
- else

View File

@ -1,4 +1,4 @@
h1 = "#{@exercise} (external user #{@external_user})"
h1 = "#{@exercise} (external user #{link_to_if(policy(@external_user).show?, @external_user.displayname, @external_user)})"
- current_submission = @submissions.first
- if current_submission
- initial_files = current_submission.files.to_a

View File

@ -236,6 +236,7 @@ de:
dashboard:
show: Dashboard
sessions:
new: Anmelden
destroy_through_lti: Code-Abgabe
statistics:
show: "Statistiken"
@ -464,6 +465,8 @@ de:
message: Diese Nachricht wird als Erklärung des aufgetretenen Fehlers angezeigt. Platzhalter werden automatisch durch Funde des regulären Ausdrucks ersetzt.
regular_expression: Dieser reguläre Ausdruck wird auf die Fehlermeldung angewendet, um relevante Bezeicher zu extrahieren.
internal_users:
index:
forgot_password: Passwort zurücksetzen
activate:
headline: Registrierung abschließen
submit: Passwort speichern

View File

@ -236,6 +236,7 @@ en:
dashboard:
show: Dashboard
sessions:
new: Sign In
destroy_through_lti: Code Submission
statistics:
show: "Statistics"
@ -464,6 +465,8 @@ en:
message: This message is used as an error explanation. Placeholders are automatically replaced by regular expression matches.
regular_expression: This regular expression is used to extract relevant identifiers from the error message.
internal_users:
index:
forgot_password: Reset Password
activate:
headline: Complete Registration
submit: Set Password