مراية لـ
https://github.com/postalserver/postal.git
تم المزامنة 2025-11-30 21:32:30 +00:00
refactor: user management
هذا الالتزام موجود في:
Adam Cooke
@@ -1,12 +0,0 @@
|
||||
Hello <%= @user.first_name %>,
|
||||
|
||||
To verify your e-mail address you will be prompted to enter a code when you login to your Postal account. The code you need to enter is:
|
||||
|
||||
<%= @user.email_verification_token %>
|
||||
|
||||
Once you've done that, you'll be able to access your account.
|
||||
|
||||
Thanks,
|
||||
|
||||
<%= Postal.smtp_from_name %>
|
||||
<%= Postal.smtp_from_address %>
|
||||
@@ -1,10 +0,0 @@
|
||||
You've been invited to access the <%= @organization.name %> organization on Postal.
|
||||
|
||||
To accept this invitation, please click the link below to create an account or login to an existing one.
|
||||
|
||||
<%= Postal.host_with_protocol %>/join/<%= @user_invite.uuid %>
|
||||
|
||||
Thanks,
|
||||
|
||||
<%= Postal.smtp_from_name %>
|
||||
<%= Postal.smtp_from_address %>
|
||||
@@ -1,14 +0,0 @@
|
||||
Hi <%= @user.first_name %>,
|
||||
|
||||
You've just changed the e-mail address on your Postal account. So that we can verify that you own the new address you've entered, we need you to enter the code below into the box shown in your web browser.
|
||||
|
||||
<%= @user.email_verification_token %>
|
||||
|
||||
If you don't have a box on your screen, just login to your Postal account to continue.
|
||||
|
||||
<%= Postal.host_with_protocol %>/login
|
||||
|
||||
Thanks,
|
||||
|
||||
<%= Postal.smtp_from_name %>
|
||||
<%= Postal.smtp_from_address %>
|
||||
@@ -29,18 +29,20 @@
|
||||
%li.siteHeader__navItem.siteHeader__navItem--organization
|
||||
= link_to organization.name, organization_root_path(organization), :class => 'siteHeader__navLinkWithMenu'
|
||||
%ul.siteHeader__subMenu
|
||||
%li.siteHeader__subMenuItem.siteHeader__subMenuItem--header= link_to organization.name, organization_settings_path(organization)
|
||||
- if organization.admin?(current_user)
|
||||
%li.siteHeader__subMenuItem= link_to "Organization Settings", organization_settings_path(organization), :class => 'siteHeader__subMenuLink'
|
||||
%li.siteHeader__subMenuItem= link_to "Manage Users", organization_users_path(organization), :class => 'siteHeader__subMenuLink'
|
||||
%li.siteHeader__subMenuItem.siteHeader__subMenuItem--header= link_to organization.name, organization_root_path(organization)
|
||||
%li.siteHeader__subMenuItem= link_to "Mail servers", organization_root_path(organization), :class => 'siteHeader__subMenuLink'
|
||||
%li.siteHeader__subMenuItem= link_to "Domains", organization_domains_path(organization), :class => 'siteHeader__subMenuLink'
|
||||
%li.siteHeader__subMenuItem= link_to "Organization Settings", organization_settings_path(organization), :class => 'siteHeader__subMenuLink'
|
||||
- if current_user.admin?
|
||||
%li.siteHeader__subMenuItem= link_to "Create new organization", :new_organization, :class => 'siteHeader__subMenuLink'
|
||||
- if current_user.organizations.present.count > 1
|
||||
%li.siteHeader__subMenuItem= link_to "Switch organization", root_path, :class => 'siteHeader__subMenuLink'
|
||||
%li.siteHeader__navItem.siteHeader__navItem--user= current_user.name
|
||||
%li.siteHeader__navItem= link_to "My Settings", settings_path, :class => 'sideHeader__navItemLink'
|
||||
- if current_user.admin? && Postal.ip_pools?
|
||||
%li.siteHeader__navItem= link_to "IP Pools", ip_pools_path, :class => 'sideHeader__navItemLink'
|
||||
- if current_user.admin?
|
||||
- if Postal.ip_pools?
|
||||
%li.siteHeader__navItem= link_to "IP Pools", ip_pools_path, :class => 'sideHeader__navItemLink'
|
||||
%li.siteHeader__navItem= link_to "Users", users_path, :class => 'sideHeader__navItemLink'
|
||||
%li.siteHeader__navItem= link_to "Logout", logout_path, :method => :delete, :class => 'sideHeader__navItemLink'
|
||||
|
||||
.siteContent
|
||||
|
||||
@@ -1,11 +1,9 @@
|
||||
- if organization.admin?(current_user)
|
||||
.navBar
|
||||
%ul
|
||||
%li.navBar__item= link_to "Mail Servers", organization_root_path(organization), :class => ['navBar__link', active_nav == :servers ? 'is-active' : '']
|
||||
%li.navBar__item= link_to "Domains", organization_domains_path(organization), :class => ['navBar__link', active_nav == :domains ? 'is-active' : '']
|
||||
%li.navBar__item= link_to "Settings", organization_settings_path(organization), :class => ['navBar__link', active_nav == :settings ? 'is-active' : '']
|
||||
- if Postal.ip_pools?
|
||||
%li.navBar__item= link_to "IPs", organization_ip_pools_path(organization), :class => ['navBar__link', active_nav == :ips ? 'is-active' : '']
|
||||
%li.navBar__item= link_to "Users", organization_users_path(organization), :class => ['navBar__link', active_nav == :users ? 'is-active' : '']
|
||||
- if organization.owner?(current_user)
|
||||
%li.navBar__item= link_to "Delete Organization", organization_delete_path(organization), :class => ['navBar__link', active_nav == :delete ? 'is-active' : '']
|
||||
.navBar
|
||||
%ul
|
||||
%li.navBar__item= link_to "Mail Servers", organization_root_path(organization), :class => ['navBar__link', active_nav == :servers ? 'is-active' : '']
|
||||
%li.navBar__item= link_to "Domains", organization_domains_path(organization), :class => ['navBar__link', active_nav == :domains ? 'is-active' : '']
|
||||
%li.navBar__item= link_to "Settings", organization_settings_path(organization), :class => ['navBar__link', active_nav == :settings ? 'is-active' : '']
|
||||
- if Postal.ip_pools?
|
||||
%li.navBar__item= link_to "IPs", organization_ip_pools_path(organization), :class => ['navBar__link', active_nav == :ips ? 'is-active' : '']
|
||||
- if current_user.admin?
|
||||
%li.navBar__item= link_to "Delete Organization", organization_delete_path(organization), :class => ['navBar__link', active_nav == :delete ? 'is-active' : '']
|
||||
|
||||
@@ -8,5 +8,4 @@
|
||||
%li.navBar__item= link_to "IP Rules", [organization, @server, :ip_pool_rules], :class => ['navBar__link', active_nav == :ip_pool_rules ? 'is-active' : '']
|
||||
- if current_user.admin?
|
||||
%li.navBar__item= link_to "Advanced Settings", [:advanced, organization, @server], :class => ['navBar__link', active_nav == :admin ? 'is-active' : '']
|
||||
- if organization.admin?(current_user)
|
||||
%li.navBar__item= link_to "Delete", [:delete, organization, @server], :class => ['navBar__link', active_nav == :delete ? 'is-active' : '']
|
||||
%li.navBar__item= link_to "Delete", [:delete, organization, @server], :class => ['navBar__link', active_nav == :delete ? 'is-active' : '']
|
||||
|
||||
@@ -13,5 +13,4 @@
|
||||
%p.sidebarServerList__mode.label{:class => "label--serverStatus-#{server.status.underscore}"}= t("server_statuses.#{server.status.underscore}")
|
||||
%p.sidebarServerList__title= server.name
|
||||
%p.sidebarServerList__quantity #{number_with_precision server.message_rate, :precision => 2} messages/minute
|
||||
- if organization.admin?(current_user)
|
||||
%p.sidebar__new= link_to "Build a new mail server", [:new, organization, :server]
|
||||
%p.sidebar__new= link_to "Build a new mail server", [:new, organization, :server]
|
||||
|
||||
@@ -1,16 +0,0 @@
|
||||
- page_title << "Join Organization"
|
||||
.pageHeader
|
||||
%h1.pageHeader__title
|
||||
Join Organization
|
||||
.pageContent.pageContent--compact
|
||||
%h2.pageContent__intro.u-margin
|
||||
Welcome to Postal.
|
||||
- if @organizations.size == 1
|
||||
You've been invited to join the <b>#{@organizations.first.name}</b> organization. Once accepted, you'll be able to
|
||||
access this organization's mail servers.
|
||||
- else
|
||||
You've been invited to join an organization
|
||||
|
||||
%p.buttonSet
|
||||
= link_to "Accept " + (@organizations.size == 1 ? "Invitation" : "Invitations"), '', :class => "button button--positive", :remote => true, :method => :post
|
||||
= link_to "Reject " + (@organizations.size == 1 ? "Invitation" : "Invitations"), '', :class => "button button--danger", :remote => true, :method => :delete
|
||||
@@ -1,41 +0,0 @@
|
||||
- @wide = true
|
||||
- page_title << "Signup"
|
||||
.subPageBox__title
|
||||
Join the #{@user_invite.organizations.first.name} organization
|
||||
= display_flash
|
||||
|
||||
.subPageBox__content
|
||||
%p.subPageBox__text
|
||||
If you don't already have an account on this system, you can create one below. Otherwise, you should
|
||||
#{link_to "login to your existing account", login_path(:return_to => join_path(@user_invite.uuid)), :class => 'u-link'}
|
||||
and add this organization to that.
|
||||
|
||||
.signupForm
|
||||
= form_for @user, :url => signup_path do |f|
|
||||
= hidden_field_tag 'return_to', params[:return_to]
|
||||
= hidden_field_tag 'invite_token', params[:invite_token]
|
||||
= f.error_messages
|
||||
.fieldSet.fieldSet--compact.u-margin
|
||||
.fieldSet__fieldPair
|
||||
.fieldSet__field
|
||||
= f.label :first_name, :class => 'fieldSet__label'
|
||||
.fieldSet__input= f.text_field :first_name, :class => 'input input--text input--onWhite', :autofocus => true
|
||||
.fieldSet__field
|
||||
= f.label :last_name, :class => 'fieldSet__label'
|
||||
.fieldSet__input= f.text_field :last_name, :class => 'input input--text input--onWhite'
|
||||
.fieldSet__field
|
||||
= f.label :email_address, :class => 'fieldSet__label'
|
||||
.fieldSet__input= f.text_field :email_address, :class => 'input input--text input--onWhite'
|
||||
.fieldSet__fieldPair
|
||||
.fieldSet__field
|
||||
= f.label :password, :class => 'fieldSet__label'
|
||||
.fieldSet__input= f.password_field :password, :class => 'input input--text input--onWhite', :placeholder => '•••••••••••'
|
||||
.fieldSet__field
|
||||
= f.label :password_confirmation, " ".html_safe, :class => 'fieldSet__label'
|
||||
.fieldSet__input= f.password_field :password_confirmation, :class => 'input input--text input--onWhite', :placeholder => '•••••••••••'
|
||||
|
||||
.loginForm__submit
|
||||
%ul.loginForm__links
|
||||
%li= link_to "Back to login", login_path(:return_to => params[:return_to])
|
||||
%p= submit_tag "Create Account", :class => 'button button--positive', :tabindex => 3
|
||||
|
||||
@@ -1,18 +0,0 @@
|
||||
- page_title << "Verify your e-mail address"
|
||||
.pageHeader
|
||||
%h1.pageHeader__title
|
||||
Please verify your e-mail address
|
||||
.pageContent.pageContent--compact
|
||||
%h2.pageContent__intro.u-margin
|
||||
We need to verify that you're the owner of the e-mail address on your account. It is currently <b>#{current_user.email_address}</b>. To
|
||||
do this, we've sent you an e-mail with a 6-digit code. Please check your e-mail and enter the code within in the box below.
|
||||
%p.pageContent__text
|
||||
If you need to change your e-mail address, you can do this in from your #{link_to 'settings page', settings_path, :class => "u-link"}.
|
||||
If you haven't received the e-mail, you can #{link_to 'click here to resend it', '', :class => "u-link"}.
|
||||
= form_tag request.fullpath, :remote => true do
|
||||
= hidden_field_tag 'return_to', params[:return_to]
|
||||
%p.u-margin
|
||||
= text_field_tag "code", params[:code], :autofocus => true, :class => 'input input--text js-multibox'
|
||||
.buttonSet.u-center
|
||||
= submit_tag "Verify my e-mail address", :class => 'button button--positive js-form-submit'
|
||||
|
||||
@@ -1,24 +1,44 @@
|
||||
= form_for @organization_user, :url => @organization_user.new_record? ? organization_users_path(organization) : organization_user_path(organization, @organization_user.user), :remote => true do |f|
|
||||
= form_for @user, :url => @user.new_record? ? users_path : user_path(@user), :remote => true do |f|
|
||||
= f.error_messages
|
||||
= hidden_field_tag 'invite', params[:invite]
|
||||
%fieldset.fieldSet
|
||||
.fieldSet
|
||||
.fieldSet__title
|
||||
Enter user details
|
||||
.fieldSet__field
|
||||
= f.label :first_name, :class => 'fieldSet__label'
|
||||
.fieldSet__input= f.text_field :first_name, :class => 'input input--text', :autofocus => true
|
||||
.fieldSet__field
|
||||
= f.label :last_name, :class => 'fieldSet__label'
|
||||
.fieldSet__input= f.text_field :last_name, :class => 'input input--text'
|
||||
.fieldSet__field
|
||||
= f.label :email_address, :class => 'fieldSet__label'
|
||||
.fieldSet__input
|
||||
= f.text_field :email_address, :autofocus => true, :class => 'input input--text', :disabled => @organization_user.persisted?
|
||||
.fieldSet__input= f.text_field :email_address, :class => 'input input--text', autocomplete: 'one-time-code'
|
||||
- unless @user.persisted?
|
||||
.fieldSet__field
|
||||
= f.label :password, :class => 'fieldSet__label'
|
||||
.fieldSet__input= f.password_field :password, :class => 'input input--text', :placeholder => '•••••••••••', autocomplete: 'one-time-code'
|
||||
.fieldSet__field
|
||||
= f.label :password_confirmation, "Confirm".html_safe, :class => 'fieldSet__label'
|
||||
.fieldSet__input= f.password_field :password_confirmation, :class => 'input input--text', :placeholder => '•••••••••••', autocomplete: 'one-time-code'
|
||||
|
||||
%fieldset.fieldSet
|
||||
.fieldSet__title
|
||||
What level of access do you wish to grant?
|
||||
.fieldSet__titleSubText
|
||||
Admin users have full access to all organizations and settings. Non-admin users will only
|
||||
have access to the organizations that you select here.
|
||||
.fieldSet__field
|
||||
= f.label :admin, :class => 'fieldSet__label'
|
||||
.fieldSet__label Admin?
|
||||
.fieldSet__input
|
||||
= f.select :admin, [["No - do not grant admin access", false], ["Yes - grant admin access", true]], {},:class => 'input input--select'
|
||||
%p.fieldSet__text
|
||||
Users who have admin access will be permitted to manage the organization as if they had the same
|
||||
access as the organization owner. This includes managing users, creating & deleting mail servers,
|
||||
and even removing the account. This level of access should granted carefully.
|
||||
Regardless of which level you select, this user will have access to all servers within the organization.
|
||||
= hidden_field_tag 'user[organization_ids][]'
|
||||
= f.select :admin, [["Yes - grant admin access", true], ["No - do not grant admin access", false]], {},:class => 'input input--select fieldSet__checkboxListAfter js-checkbox-list-toggle'
|
||||
%ul.checkboxList{:class => [@user.admin? ? 'is-hidden' : '']}
|
||||
- for org in Organization.order(:name).to_a
|
||||
%li.checkboxList__item
|
||||
.checkboxList__checkbox= check_box_tag "user[organization_ids][]", org.id, @user.organizations.include?(org), :id => "org_#{org.id}"
|
||||
.checkboxList__label
|
||||
= label_tag "org_#{org.id}", org.name, :class => 'checkboxList__actualLabel'
|
||||
|
||||
.fieldSetSubmit.buttonSet
|
||||
= submit_tag @organization_user.new_record? ? "Add User" : "Save User", :class => 'button button--positive js-form-submit'
|
||||
= submit_tag @user.new_record? ? "Add User" : "Save User", :class => 'button button--positive js-form-submit'
|
||||
.fieldSetSubmit__delete
|
||||
= link_to "Back to user list", [organization, :users], :class => 'button button--neutral'
|
||||
= link_to "Back to user list", :users, :class => 'button button--neutral'
|
||||
|
||||
@@ -3,13 +3,10 @@
|
||||
.pageHeader
|
||||
%h1.pageHeader__title
|
||||
%span.pageHeader__titlePrevious
|
||||
= @organization.name
|
||||
→
|
||||
Users
|
||||
= link_to 'Users', users_path
|
||||
→
|
||||
Edit user permissions
|
||||
|
||||
= render 'organizations/nav', :active_nav => :users
|
||||
.pageContent.pageContent--compact
|
||||
= render 'form'
|
||||
|
||||
|
||||
@@ -1,57 +1,21 @@
|
||||
- page_title << "Users"
|
||||
.pageHeader
|
||||
%h1.pageHeader__title
|
||||
%span.pageHeader__titlePrevious
|
||||
= @organization.name
|
||||
→
|
||||
Users
|
||||
|
||||
= render 'organizations/nav', :active_nav => :users
|
||||
.pageContent.pageContent--compact
|
||||
- if @users.empty? && @pending_users.empty?
|
||||
.noData.noData--clean
|
||||
%p.noData__title There are no users assigned to this organization.
|
||||
%p.noData__text
|
||||
You add additional users that will be permitted to access this organization.
|
||||
They will be sent an email and they'll be able to create an account which will
|
||||
allow them to login and access this organization.
|
||||
%p.noData__button.buttonSet.buttonSet--center
|
||||
= link_to "Invite the first user", [:new, organization, :user], :class => 'button button--positive'
|
||||
%ul.userList.u-margin
|
||||
- for user in @users
|
||||
%li.userList__item
|
||||
= image_tag user.avatar_url, :class => 'userList__avatar'
|
||||
.userList__details
|
||||
%p.userList__name
|
||||
= user.name
|
||||
- if user.admin?
|
||||
%span.userList__admin.label Admin
|
||||
%p.userList__email= user.email_address
|
||||
%ul.userList__actions
|
||||
%li= link_to "Edit permissions", [:edit, user]
|
||||
%li= link_to "Delete user", user, :method => :delete, :data => {:confirm => "Are you sure you wish to revoke #{user.name}'s access?", :disable_with => "Deleting..."}, :remote => true, :class => 'userList__revoke'
|
||||
|
||||
- else
|
||||
%p.pageContent__intro.u-margin
|
||||
You can share access to this organization with other people by adding them
|
||||
here. They'll need to create their own account first and then you'll be able
|
||||
to add them to your organization by entering their e-mail address.
|
||||
|
||||
%ul.userList.u-margin
|
||||
- for user in @users
|
||||
%li.userList__item
|
||||
= image_tag user.user.avatar_url, :class => 'userList__avatar'
|
||||
.userList__details
|
||||
%p.userList__name
|
||||
= user.user.name
|
||||
- if user.user == organization.owner
|
||||
%span.userList__owner.label Owner
|
||||
- elsif user.admin?
|
||||
%span.userList__admin.label Admin
|
||||
%p.userList__email= user.user.email_address
|
||||
%ul.userList__actions
|
||||
- if organization.owner != user.user
|
||||
%li= link_to "Edit permissions", [:edit, organization, user.user]
|
||||
- if organization.owner == current_user
|
||||
%li= link_to "Make owner", [:make_owner, organization, user.user], :method => :post, :data => {:confirm => "Are you sure you wish to make #{user.user.name} the owner of this organization? They will be granted full admin access. You won't be able to change this back.", :disable_with => "Promoting..."}, :remote => true
|
||||
%li= link_to "Revoke access", [organization, user.user], :method => :delete, :data => {:confirm => "Are you sure you wish to revoke #{user.user.name}'s access to the organization?", :disable_with => "Deleting..."}, :remote => true, :class => 'userList__revoke'
|
||||
- for user in @pending_users
|
||||
%li.userList__item
|
||||
= image_tag user.user.avatar_url, :class => 'userList__avatar'
|
||||
.userList__details
|
||||
%p.userList__name
|
||||
= user.user.email_address
|
||||
%span.userList__pending.label Pending
|
||||
%ul.userList__actions
|
||||
%li= link_to "Edit permissions", edit_organization_user_path(organization, user.user, :invite => 1)
|
||||
%li= link_to "Cancel invitation", organization_user_path(organization, user.user, :invite => 1), :method => :delete, :data => {:confirm => "Are you sure you wish to cancel this invitation?", :disable_with => "Deleting..."}, :remote => true, :class => 'userList__revoke'
|
||||
|
||||
|
||||
%p.u-center= link_to "Invite a new user", [:new, organization, :user], :class => 'button button--positive'
|
||||
%p.u-center= link_to "Add a new user", :new_user, :class => 'button button--positive'
|
||||
|
||||
@@ -3,17 +3,14 @@
|
||||
.pageHeader
|
||||
%h1.pageHeader__title
|
||||
%span.pageHeader__titlePrevious
|
||||
= @organization.name
|
||||
→
|
||||
Users
|
||||
= link_to 'Users', :users
|
||||
→
|
||||
Add user
|
||||
|
||||
= render 'organizations/nav', :active_nav => :users
|
||||
.pageContent.pageContent--compact
|
||||
%p.pageContent__intro.u-margin
|
||||
To add someone to your organization enter their e-mail address below. If
|
||||
they don't already have a Postal account, they'll need to create one
|
||||
before you can add them to your account.
|
||||
To add someone to this Postal installation, you can add them below. You'll need to
|
||||
choose whether to make them an admin (full access to all organizations and settings)
|
||||
or whether you wish to limit them to specific organizations.
|
||||
= render 'form'
|
||||
|
||||
|
||||
المرجع في مشكلة جديدة
حظر مستخدم