{{ $t("No participant matches the filters") }}
+
+ {{
+ $t(
+ "Enter your email address below, and we'll email you instructions on how to change your password."
+ )
+ }}
+
@@ -37,6 +40,7 @@
import { Component, Prop, Vue } from "vue-property-decorator";
import { validateEmailField, validateRequiredField } from "../../utils/validators";
import { RESEND_CONFIRMATION_EMAIL } from "../../graphql/auth";
+import RouteName from "../../router/name";
@Component
export default class ResendConfirmation extends Vue {
@@ -50,6 +54,8 @@ export default class ResendConfirmation extends Vue {
error = false;
+ RouteName = RouteName;
+
state = {
email: {
status: null,
diff --git a/js/src/views/User/SendPasswordReset.vue b/js/src/views/User/SendPasswordReset.vue
index c1d14cd87..941e913a2 100644
--- a/js/src/views/User/SendPasswordReset.vue
+++ b/js/src/views/User/SendPasswordReset.vue
@@ -3,8 +3,15 @@
- {{ $t("Password reset") }}
+ {{ $t("Forgot your password?") }}
+
@@ -41,6 +51,7 @@
import { Component, Prop, Vue } from "vue-property-decorator";
import { validateEmailField, validateRequiredField } from "../../utils/validators";
import { SEND_RESET_PASSWORD } from "../../graphql/auth";
+import RouteName from "../../router/name";
@Component
export default class SendPasswordReset extends Vue {
@@ -52,6 +63,8 @@ export default class SendPasswordReset extends Vue {
validationSent = false;
+ RouteName = RouteName;
+
errors: string[] = [];
state = {
diff --git a/lib/graphql/resolvers/event.ex b/lib/graphql/resolvers/event.ex
index 824c5e869..808de4fd3 100644
--- a/lib/graphql/resolvers/event.ex
+++ b/lib/graphql/resolvers/event.ex
@@ -92,7 +92,8 @@ defmodule Mobilizon.GraphQL.Resolvers.Event do
|> Enum.map(&String.to_existing_atom/1)
end
- {:ok, Events.list_participants_for_event(event_id, roles, page, limit)}
+ participants = Events.list_participants_for_event(event_id, roles, page, limit)
+ {:ok, participants}
else
{:is_owned, nil} ->
{:error, "Moderator Actor ID is not owned by authenticated user"}
@@ -115,17 +116,12 @@ defmodule Mobilizon.GraphQL.Resolvers.Event do
_args,
%{context: %{current_user: %User{id: user_id} = _user}} = _resolution
) do
- if Events.is_user_moderator_for_event?(user_id, event_id) do
- stats =
- Map.put(
- stats,
- :going,
- stats.participant + stats.moderator + stats.administrator + stats.creator
- )
+ going = stats.participant + stats.moderator + stats.administrator + stats.creator
- {:ok, stats}
+ if Events.is_user_moderator_for_event?(user_id, event_id) do
+ {:ok, Map.put(stats, :going, going)}
else
- {:ok, %EventParticipantStats{}}
+ {:ok, %{going: going}}
end
end
diff --git a/lib/mobilizon/events/events.ex b/lib/mobilizon/events/events.ex
index 4a942b78b..f9f01e6e5 100644
--- a/lib/mobilizon/events/events.ex
+++ b/lib/mobilizon/events/events.ex
@@ -752,7 +752,6 @@ defmodule Mobilizon.Events do
end
@moderator_roles [:moderator, :administrator, :creator]
- @default_participant_roles [:participant] ++ @moderator_roles
@doc """
Returns the list of participants for an event.
@@ -762,13 +761,14 @@ defmodule Mobilizon.Events do
Page.t()
def list_participants_for_event(
id,
- roles \\ @default_participant_roles,
+ roles \\ [],
page \\ nil,
limit \\ nil
) do
id
|> list_participants_for_event_query()
|> filter_role(roles)
+ |> order_by(asc: :role)
|> Page.build_page(page, limit)
end
diff --git a/lib/web/views/error_view.ex b/lib/web/views/error_view.ex
index d52d16fe3..398c8b954 100644
--- a/lib/web/views/error_view.ex
+++ b/lib/web/views/error_view.ex
@@ -4,11 +4,11 @@ defmodule Mobilizon.Web.ErrorView do
"""
use Mobilizon.Web, :view
alias Mobilizon.Service.Metadata.Instance
- alias Mobilizon.Web.PageView
+ import Mobilizon.Web.Views.Utils
- def render("404.html", _assigns) do
+ def render("404.html", %{conn: conn}) do
tags = Instance.build_tags()
- PageView.inject_tags(tags)
+ inject_tags(tags, get_locale(conn))
end
def render("404.json", _assigns) do
diff --git a/lib/web/views/page_view.ex b/lib/web/views/page_view.ex
index 7bbd75f45..3615ddc15 100644
--- a/lib/web/views/page_view.ex
+++ b/lib/web/views/page_view.ex
@@ -13,10 +13,10 @@ defmodule Mobilizon.Web.PageView do
alias Mobilizon.Service.Metadata
alias Mobilizon.Service.Metadata.Instance
- alias Mobilizon.Service.Metadata.Utils, as: MetadataUtils
alias Mobilizon.Federation.ActivityPub.Utils
alias Mobilizon.Federation.ActivityStream.Convertible
+ import Mobilizon.Web.Views.Utils
def render("actor.activity-json", %{conn: %{assigns: %{object: %Actor{} = actor}}}) do
actor
@@ -59,38 +59,4 @@ defmodule Mobilizon.Web.PageView do
tags = Instance.build_tags()
inject_tags(tags, get_locale(conn))
end
-
- @spec inject_tags(List.t(), String.t()) :: {:safe, String.t()}
- def inject_tags(tags, locale \\ "en") do
- with {:ok, index_content} <- File.read(index_file_path()) do
- do_replacements(index_content, MetadataUtils.stringify_tags(tags), locale)
- end
- end
-
- @spec index_file_path :: String.t()
- defp index_file_path do
- Path.join(Application.app_dir(:mobilizon, "priv/static"), "index.html")
- end
-
- @spec replace_meta(String.t(), String.t()) :: String.t()
- # TODO: Find why it's different in dev/prod and during tests
- defp replace_meta(index_content, tags) do
- index_content
- |> String.replace("", tags)
- |> String.replace("", tags)
- end
-
- @spec do_replacements(String.t(), String.t(), String.t()) :: {:safe, String.t()}
- defp do_replacements(index_content, tags, locale) do
- index_content
- |> replace_meta(tags)
- |> String.replace("", "")
- |> String.replace("", "")
- |> (&{:safe, &1}).()
- end
-
- @spec get_locale(Conn.t()) :: String.t()
- defp get_locale(%{private: %{cldr_locale: nil}}), do: "en"
- defp get_locale(%{private: %{cldr_locale: %{requested_locale_name: locale}}}), do: locale
- defp get_locale(_), do: "en"
end
diff --git a/lib/web/views/utils.ex b/lib/web/views/utils.ex
new file mode 100644
index 000000000..234e222cf
--- /dev/null
+++ b/lib/web/views/utils.ex
@@ -0,0 +1,41 @@
+defmodule Mobilizon.Web.Views.Utils do
+ @moduledoc """
+ Utils for views
+ """
+
+ alias Mobilizon.Service.Metadata.Utils, as: MetadataUtils
+
+ @spec inject_tags(List.t(), String.t()) :: {:safe, String.t()}
+ def inject_tags(tags, locale \\ "en") do
+ with {:ok, index_content} <- File.read(index_file_path()) do
+ do_replacements(index_content, MetadataUtils.stringify_tags(tags), locale)
+ end
+ end
+
+ @spec index_file_path :: String.t()
+ defp index_file_path do
+ Path.join(Application.app_dir(:mobilizon, "priv/static"), "index.html")
+ end
+
+ @spec replace_meta(String.t(), String.t()) :: String.t()
+ # TODO: Find why it's different in dev/prod and during tests
+ defp replace_meta(index_content, tags) do
+ index_content
+ |> String.replace("", tags)
+ |> String.replace("", tags)
+ end
+
+ @spec do_replacements(String.t(), String.t(), String.t()) :: {:safe, String.t()}
+ defp do_replacements(index_content, tags, locale) do
+ index_content
+ |> replace_meta(tags)
+ |> String.replace("", "")
+ |> String.replace("", "")
+ |> (&{:safe, &1}).()
+ end
+
+ @spec get_locale(Conn.t()) :: String.t()
+ def get_locale(%{private: %{cldr_locale: nil}}), do: "en"
+ def get_locale(%{private: %{cldr_locale: %{requested_locale_name: locale}}}), do: locale
+ def get_locale(_), do: "en"
+end
diff --git a/priv/repo/migrations/20190929170817_rename_postgres_types.exs b/priv/repo/migrations/20190929170817_rename_postgres_types.exs
index cb129d5b5..a46d0d28b 100644
--- a/priv/repo/migrations/20190929170817_rename_postgres_types.exs
+++ b/priv/repo/migrations/20190929170817_rename_postgres_types.exs
@@ -2,7 +2,7 @@ defmodule Mobilizon.Storage.Repo.Migrations.RenamePostgresTypes do
use Ecto.Migration
alias Mobilizon.Actors.{ActorVisibility, MemberRole}
- alias alias Mobilizon.Conversations.CommentVisibility
+ alias Mobilizon.Conversations.CommentVisibility
alias Mobilizon.Events.{
JoinOptions,
diff --git a/test/federation/activity_pub/transmogrifier_test.exs b/test/federation/activity_pub/transmogrifier_test.exs
index 56ed28449..1960c46b3 100644
--- a/test/federation/activity_pub/transmogrifier_test.exs
+++ b/test/federation/activity_pub/transmogrifier_test.exs
@@ -1365,8 +1365,7 @@ defmodule Mobilizon.Federation.ActivityPub.TransmogrifierTest do
assert event.id
|> Events.list_participants_for_event()
|> Map.get(:elements)
- |> Enum.map(& &1.id) ==
- []
+ |> Enum.map(& &1.role) == [:rejected]
end
end