From e04e98e6b239e2e44f5b16200d053a8f46b7f9ef Mon Sep 17 00:00:00 2001 From: franpb14 Date: Sun, 9 Oct 2022 21:46:18 +0200 Subject: [PATCH 1/4] signup working and redirected after create user WIP just a first step --- app/controllers/terms_controller.rb | 2 +- app/controllers/users_controller.rb | 38 +++++++++++++++++--------- app/policies/user_policy.rb | 2 +- app/views/devise/sessions/new.html.erb | 8 ++++++ app/views/users/_form.html.erb | 22 ++++++++++++--- app/views/users/edit.html.erb | 2 +- app/views/users/new.html.erb | 2 +- app/views/users/signup.html.erb | 1 + config/routes.rb | 1 + 9 files changed, 57 insertions(+), 21 deletions(-) create mode 100644 app/views/users/signup.html.erb diff --git a/app/controllers/terms_controller.rb b/app/controllers/terms_controller.rb index ecf1ce81e..456c919f5 100644 --- a/app/controllers/terms_controller.rb +++ b/app/controllers/terms_controller.rb @@ -8,6 +8,6 @@ def show def accept current_user.touch :terms_accepted_at - redirect_to root_path + redirect_to(current_user.organizations.empty? ? organizations_path : root_path) end end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 79e48b807..46d4b5074 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1,5 +1,5 @@ class UsersController < ApplicationController - before_action :authenticate_user!, :member_should_be_active + before_action :authenticate_user!, :member_should_be_active, except: [:signup, :create] has_scope :tagged_with, as: :tag @@ -41,8 +41,10 @@ def create @user.setup_and_save_user if @user.persisted? - @user.tune_after_persisted(current_organization) - @user.add_tags(current_organization, params[:tag_list] || []) + unless request.referer.include?(signup_users_path) + @user.tune_after_persisted(current_organization) + @user.add_tags(current_organization, params[:tag_list] || []) + end redirect_to_after_create else @@ -65,6 +67,10 @@ def update end end + def signup + @user = User.new + end + def update_avatar operation = AvatarGenerator.new(current_user, params) @@ -102,6 +108,7 @@ def user_params fields_to_permit += %w"admin registration_number registration_date" if admin? fields_to_permit += %w"organization_id superadmin" if superadmin? + fields_to_permit += %w"password" if request.referer.include?(signup_users_path) params.require(:user).permit *fields_to_permit end @@ -115,17 +122,22 @@ def find_user end def redirect_to_after_create - id = @user.member(current_organization).member_uid - if params[:more] - redirect_to new_user_path, - notice: I18n.t("users.new.user_created_add", - uid: id, - name: @user.username) + if request.referer.include?(signup_users_path) + sign_in(@user) + redirect_to terms_path else - redirect_to users_path, - notice: I18n.t("users.index.user_created", - uid: id, - name: @user.username) + id = @user.member(current_organization).member_uid + if params[:more] + redirect_to new_user_path, + notice: I18n.t("users.new.user_created_add", + uid: id, + name: @user.username) + else + redirect_to users_path, + notice: I18n.t("users.index.user_created", + uid: id, + name: @user.username) + end end end end diff --git a/app/policies/user_policy.rb b/app/policies/user_policy.rb index 43682895f..d65f899f9 100644 --- a/app/policies/user_policy.rb +++ b/app/policies/user_policy.rb @@ -1,6 +1,6 @@ class UserPolicy < ApplicationPolicy def create? - user.admins?(organization) + !user || user.admins?(organization) end def update? diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb index 2c8d1320f..2ecaac46c 100644 --- a/app/views/devise/sessions/new.html.erb +++ b/app/views/devise/sessions/new.html.erb @@ -43,6 +43,14 @@ + OR +
+
+
+ <%= link_to 'Sign up', signup_users_path, class: "btn btn-primary btn-lg col-xs-12" %> +
+
+
<% end %>
diff --git a/app/views/users/_form.html.erb b/app/views/users/_form.html.erb index 39a845213..d18b5765b 100644 --- a/app/views/users/_form.html.erb +++ b/app/views/users/_form.html.erb @@ -3,7 +3,7 @@
<%= f.input :username %> - <% if admin? %> + <% if admin? || short %> <%= f.input :email %> <% if @user.unconfirmed_email.present? %> <%= f.input :unconfirmed_email, readonly: true %> @@ -12,6 +12,17 @@ <%= f.input :email, readonly: true %> <% end %> + <% if short %> +
+
+ + lock + + <%= f.password_field :password, required: true, autofocus: true, placeholder: t("application.login_form.password"), class: "form-control input-lg" %> +
+
+ <% end %> + <%= f.input :phone %> <%= f.input :alt_phone %> <%= f.input :gender, collection: genders_collection %> @@ -49,9 +60,12 @@
<%= f.button :submit %> - <% if @user.new_record? %> - <%= f.button :submit, t('users.new.create_more_users_button'), name: 'more' %> + + <% if !short %> + <% if @user.new_record? %> + <%= f.button :submit, t('users.new.create_more_users_button'), name: 'more' %> + <% end %> + <%= link_to t('users.new.cancel'), users_path, class: "btn btn-default" %> <% end %> - <%= link_to t('users.new.cancel'), users_path, class: "btn btn-default" %>
<% end %> diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb index 55fb08316..1a5e3d53e 100644 --- a/app/views/users/edit.html.erb +++ b/app/views/users/edit.html.erb @@ -3,4 +3,4 @@ <%= t ".edit_user" %> -<%= render "form", member: @user.as_member_of(current_organization) %> +<%= render "form", member: @user.as_member_of(current_organization), short: false %> diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb index 5d83ed235..f2d83fec9 100644 --- a/app/views/users/new.html.erb +++ b/app/views/users/new.html.erb @@ -1,4 +1,4 @@

<%= t ".new_user" %>

-<%= render "form", member: Member.new %> +<%= render "form", member: Member.new, short: false %> diff --git a/app/views/users/signup.html.erb b/app/views/users/signup.html.erb new file mode 100644 index 000000000..3a5ee8d5d --- /dev/null +++ b/app/views/users/signup.html.erb @@ -0,0 +1 @@ +<%= render 'form', member: Member.new, short: true %> diff --git a/config/routes.rb b/config/routes.rb index e41d2670e..a1f3d7b88 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -37,6 +37,7 @@ resources :users, concerns: :accountable, except: :destroy, :path => "members" do collection do + get 'signup' get 'manage' end end From 91b46b7256bad2bcad96a45c30a6b74921b10e47 Mon Sep 17 00:00:00 2001 From: franpb14 Date: Sun, 16 Oct 2022 22:11:00 +0200 Subject: [PATCH 2/4] users can apply to join an organization --- app/controllers/petition_controller.rb | 23 ++++++ app/models/organization.rb | 1 + app/models/petition.rb | 10 +++ app/models/user.rb | 1 + app/views/organizations/index.html.erb | 10 +++ config/routes.rb | 1 + db/migrate/20221016192111_create_petitions.rb | 11 +++ db/structure.sql | 81 ++++++++++++++++++- 8 files changed, 137 insertions(+), 1 deletion(-) create mode 100644 app/controllers/petition_controller.rb create mode 100644 app/models/petition.rb create mode 100644 db/migrate/20221016192111_create_petitions.rb diff --git a/app/controllers/petition_controller.rb b/app/controllers/petition_controller.rb new file mode 100644 index 000000000..1ec68c1ec --- /dev/null +++ b/app/controllers/petition_controller.rb @@ -0,0 +1,23 @@ +class PetitionController < ApplicationController + def create + petition = Petition.new petition_params + + if petition.save + flash[:notice] = 'Application sent' + else + flash[:error] = 'Something went wrong' + end + + redirect_to organizations_path + end + + def update + + end + + private + + def petition_params + params.permit(%i[organization_id user_id status]) + end +end diff --git a/app/models/organization.rb b/app/models/organization.rb index dfc7a4b00..154432653 100644 --- a/app/models/organization.rb +++ b/app/models/organization.rb @@ -21,6 +21,7 @@ class Organization < ApplicationRecord has_many :offers has_many :inquiries has_many :documents, as: :documentable, dependent: :destroy + has_many :petitions validates :name, presence: true, uniqueness: true diff --git a/app/models/petition.rb b/app/models/petition.rb new file mode 100644 index 000000000..3881b73df --- /dev/null +++ b/app/models/petition.rb @@ -0,0 +1,10 @@ +class Petition < ApplicationRecord + belongs_to :user + belongs_to :organization + + STATUS = { + 0 => 'pending', + 1 => 'accepted', + 2 => 'declined' + } +end diff --git a/app/models/user.rb b/app/models/user.rb index 4f3e006c8..24381cd95 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -27,6 +27,7 @@ class User < ApplicationRecord has_many :offers has_many :inquiries has_many :device_tokens + has_many :petitions accepts_nested_attributes_for :members diff --git a/app/views/organizations/index.html.erb b/app/views/organizations/index.html.erb index 1f3ccad94..6be87d2c2 100644 --- a/app/views/organizations/index.html.erb +++ b/app/views/organizations/index.html.erb @@ -27,6 +27,7 @@ <%= t '.neighborhood' %> <%= t '.web' %> <%= t '.member_count' %> + <%= ''.html_safe if current_user %> @@ -37,6 +38,15 @@ <%= org.neighborhood %> <%= link_to(org.web, org.web) if org.web.present? %> <%= org.members.count %> + <% if current_user %> + + <% if petition = current_user.petitions.where(organization_id: org.id).last %> + <%= Petition::STATUS[petition.status] %> + <% else %> + <%= link_to 'Apply to join', petition_index_path(user_id: current_user.id, organization_id: org.id, status: 0), method: :post %> + <% end %> + + <% end %> <% end %> diff --git a/config/routes.rb b/config/routes.rb index a1f3d7b88..aaf0e1e9f 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -42,6 +42,7 @@ end end put :update_avatar, to: 'users#update_avatar' + resources :petition, only: %i[create update] resources :transfers, only: [:new, :create] do member do diff --git a/db/migrate/20221016192111_create_petitions.rb b/db/migrate/20221016192111_create_petitions.rb new file mode 100644 index 000000000..56511765c --- /dev/null +++ b/db/migrate/20221016192111_create_petitions.rb @@ -0,0 +1,11 @@ +class CreatePetitions < ActiveRecord::Migration[6.1] + def change + create_table :petitions do |t| + t.references :user, null: false, foreign_key: true + t.references :organization, null: false, foreign_key: true + t.integer :status + + t.timestamps + end + end +end diff --git a/db/structure.sql b/db/structure.sql index 8ad16f15b..668103690 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -512,6 +512,39 @@ CREATE SEQUENCE public.organizations_id_seq ALTER SEQUENCE public.organizations_id_seq OWNED BY public.organizations.id; +-- +-- Name: petitions; Type: TABLE; Schema: public; Owner: - +-- + +CREATE TABLE public.petitions ( + id bigint NOT NULL, + user_id bigint NOT NULL, + organization_id bigint NOT NULL, + status integer, + created_at timestamp(6) without time zone NOT NULL, + updated_at timestamp(6) without time zone NOT NULL +); + + +-- +-- Name: petitions_id_seq; Type: SEQUENCE; Schema: public; Owner: - +-- + +CREATE SEQUENCE public.petitions_id_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + + +-- +-- Name: petitions_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: - +-- + +ALTER SEQUENCE public.petitions_id_seq OWNED BY public.petitions.id; + + -- -- Name: posts; Type: TABLE; Schema: public; Owner: - -- @@ -777,6 +810,13 @@ ALTER TABLE ONLY public.movements ALTER COLUMN id SET DEFAULT nextval('public.mo ALTER TABLE ONLY public.organizations ALTER COLUMN id SET DEFAULT nextval('public.organizations_id_seq'::regclass); +-- +-- Name: id; Type: DEFAULT; Schema: public; Owner: - +-- + +ALTER TABLE ONLY public.petitions ALTER COLUMN id SET DEFAULT nextval('public.petitions_id_seq'::regclass); + + -- -- Name: id; Type: DEFAULT; Schema: public; Owner: - -- @@ -909,6 +949,14 @@ ALTER TABLE ONLY public.organizations ADD CONSTRAINT organizations_pkey PRIMARY KEY (id); +-- +-- Name: petitions_pkey; Type: CONSTRAINT; Schema: public; Owner: - +-- + +ALTER TABLE ONLY public.petitions + ADD CONSTRAINT petitions_pkey PRIMARY KEY (id); + + -- -- Name: posts_pkey; Type: CONSTRAINT; Schema: public; Owner: - -- @@ -1081,6 +1129,20 @@ CREATE INDEX index_movements_on_transfer_id ON public.movements USING btree (tra CREATE UNIQUE INDEX index_organizations_on_name ON public.organizations USING btree (name); +-- +-- Name: index_petitions_on_organization_id; Type: INDEX; Schema: public; Owner: - +-- + +CREATE INDEX index_petitions_on_organization_id ON public.petitions USING btree (organization_id); + + +-- +-- Name: index_petitions_on_user_id; Type: INDEX; Schema: public; Owner: - +-- + +CREATE INDEX index_petitions_on_user_id ON public.petitions USING btree (user_id); + + -- -- Name: index_posts_on_category_id; Type: INDEX; Schema: public; Owner: - -- @@ -1175,6 +1237,22 @@ ALTER TABLE ONLY public.events ADD CONSTRAINT events_transfer_id_fkey FOREIGN KEY (transfer_id) REFERENCES public.transfers(id); +-- +-- Name: fk_rails_0f0c5fe120; Type: FK CONSTRAINT; Schema: public; Owner: - +-- + +ALTER TABLE ONLY public.petitions + ADD CONSTRAINT fk_rails_0f0c5fe120 FOREIGN KEY (organization_id) REFERENCES public.organizations(id); + + +-- +-- Name: fk_rails_148f563e25; Type: FK CONSTRAINT; Schema: public; Owner: - +-- + +ALTER TABLE ONLY public.petitions + ADD CONSTRAINT fk_rails_148f563e25 FOREIGN KEY (user_id) REFERENCES public.users(id); + + -- -- Name: fk_rails_1ceb778440; Type: FK CONSTRAINT; Schema: public; Owner: - -- @@ -1285,6 +1363,7 @@ INSERT INTO "schema_migrations" (version) VALUES ('20210423193937'), ('20210424174640'), ('20210502160343'), -('20210503201944'); +('20210503201944'), +('20221016192111'); From 264a4535c8d6e26779e6fea4cf7f93dbf52a972b Mon Sep 17 00:00:00 2001 From: franpb14 Date: Mon, 17 Oct 2022 20:35:52 +0200 Subject: [PATCH 3/4] admins can manage applications --- app/controllers/petition_controller.rb | 23 ------ app/controllers/petitions_controller.rb | 38 +++++++++ app/models/organization.rb | 2 +- app/models/user.rb | 2 +- .../_organization_listings_menu.html.erb | 6 ++ app/views/organizations/index.html.erb | 2 +- app/views/petitions/manage.html.erb | 82 +++++++++++++++++++ config/routes.rb | 7 +- 8 files changed, 135 insertions(+), 27 deletions(-) delete mode 100644 app/controllers/petition_controller.rb create mode 100644 app/controllers/petitions_controller.rb create mode 100644 app/views/petitions/manage.html.erb diff --git a/app/controllers/petition_controller.rb b/app/controllers/petition_controller.rb deleted file mode 100644 index 1ec68c1ec..000000000 --- a/app/controllers/petition_controller.rb +++ /dev/null @@ -1,23 +0,0 @@ -class PetitionController < ApplicationController - def create - petition = Petition.new petition_params - - if petition.save - flash[:notice] = 'Application sent' - else - flash[:error] = 'Something went wrong' - end - - redirect_to organizations_path - end - - def update - - end - - private - - def petition_params - params.permit(%i[organization_id user_id status]) - end -end diff --git a/app/controllers/petitions_controller.rb b/app/controllers/petitions_controller.rb new file mode 100644 index 000000000..82b05c25b --- /dev/null +++ b/app/controllers/petitions_controller.rb @@ -0,0 +1,38 @@ +class PetitionsController < ApplicationController + def create + petition = Petition.new petition_params + + if petition.save + flash[:notice] = 'Application sent' + else + flash[:error] = 'Something went wrong' + end + + redirect_to organizations_path + end + + def update + petition = Petition.find params[:id] + status = params[:status].to_i + + if petition.update(status: status) + User.find(params[:user_id]).add_to_organization(current_organization) if status == 1 + flash[:notice] = "Application #{Petition::STATUS[status]}" + else + flash[:error] = 'Something went wrong' + end + + redirect_to manage_petitions_path + end + + def manage + @status = params[:status].to_i + @users = User.joins(:petitions).where(petitions: { organization_id: current_organization.id, status: @status }).page(params[:page]).per(20) + end + + private + + def petition_params + params.permit(%i[organization_id user_id status]) + end +end diff --git a/app/models/organization.rb b/app/models/organization.rb index 154432653..2b6cef8ac 100644 --- a/app/models/organization.rb +++ b/app/models/organization.rb @@ -21,7 +21,7 @@ class Organization < ApplicationRecord has_many :offers has_many :inquiries has_many :documents, as: :documentable, dependent: :destroy - has_many :petitions + has_many :petitions, dependent: :delete_all validates :name, presence: true, uniqueness: true diff --git a/app/models/user.rb b/app/models/user.rb index 24381cd95..d14700328 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -27,7 +27,7 @@ class User < ApplicationRecord has_many :offers has_many :inquiries has_many :device_tokens - has_many :petitions + has_many :petitions, dependent: :delete_all accepts_nested_attributes_for :members diff --git a/app/views/application/menus/_organization_listings_menu.html.erb b/app/views/application/menus/_organization_listings_menu.html.erb index 83c90dcc6..57b3ccdeb 100644 --- a/app/views/application/menus/_organization_listings_menu.html.erb +++ b/app/views/application/menus/_organization_listings_menu.html.erb @@ -11,6 +11,12 @@ <%= t "application.navbar.users" %> <% end %> +
  • + <%= link_to manage_petitions_path do %> + <%= glyph 'list-alt' %> + <%= 'Manage Applications' %> + <% end %> +
  • <%= link_to offers_path(org: current_organization) do %> <%= glyph :link %> diff --git a/app/views/organizations/index.html.erb b/app/views/organizations/index.html.erb index 6be87d2c2..9cb499827 100644 --- a/app/views/organizations/index.html.erb +++ b/app/views/organizations/index.html.erb @@ -43,7 +43,7 @@ <% if petition = current_user.petitions.where(organization_id: org.id).last %> <%= Petition::STATUS[petition.status] %> <% else %> - <%= link_to 'Apply to join', petition_index_path(user_id: current_user.id, organization_id: org.id, status: 0), method: :post %> + <%= link_to 'Apply to join', petitions_path(user_id: current_user.id, organization_id: org.id, status: 0), method: :post %> <% end %> <% end %> diff --git a/app/views/petitions/manage.html.erb b/app/views/petitions/manage.html.erb new file mode 100644 index 000000000..f40ec0926 --- /dev/null +++ b/app/views/petitions/manage.html.erb @@ -0,0 +1,82 @@ +
    +
    +
    +

    + <%= link_to current_organization.name, current_organization %> + <%= 'Applications' %> +

    +
    +
    +
    + +
    +
    +
      +
    • "> + <%= link_to manage_petitions_path(status: 0) do %> + <%= glyph :minus %> + <%= 'Pending applications' %> + <% end %> +
      • +
    • "> + <%= link_to manage_petitions_path(status: 1) do %> + <%= glyph :ok %> + <%= 'Accepted applications' %> + <% end %> +
      • +
    • "> + <%= link_to manage_petitions_path(status: 2) do %> + <%= glyph :remove %> + <%= 'Declined applications' %> + <% end %> +
      • +
    +
    +
    + +
    +
    +
    +
    + + + + + + + + + <% if current_user.manages?(current_organization) && @status == 0 %> + + <% end %> + + + + <% @users.each do |user| %> + <%= content_tag(:tr) do %> + <% petition = user.petitions.where(organization_id: current_organization.id).last %> + + + + + + <% if current_user.manages?(current_organization) && @status == 0 %> + + <% end %> + <% end %> + <% end %> + +
    <%= 'ID' %><%= 'username' %><%= User.human_attribute_name(:email) %><%= User.human_attribute_name(:phone) %> + + <%= t(".actions") %> +
    <%= image_tag avatar_url(user.user) %><%= user.id %><%= user.username %><%= user.email %><%= phone_to user.phone %> + <%= link_to 'Accept', petition_path(id: petition.id, user_id: user.id, status: 1), class: 'btn btn-primary', method: :put %> + <%= link_to 'Decline', petition_path(id: petition.id, user_id: user.id, status: 2), class: 'btn btn-danger', method: :put %> +
    +
    +
    + <%= paginate @users %> +
    +
    +
    +
    diff --git a/config/routes.rb b/config/routes.rb index aaf0e1e9f..4b873dd5c 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -42,7 +42,12 @@ end end put :update_avatar, to: 'users#update_avatar' - resources :petition, only: %i[create update] + + resources :petitions, only: [:create, :update] do + collection do + get 'manage' + end + end resources :transfers, only: [:new, :create] do member do From b499db6cdc392a43af6fe5e89013bf575932eae8 Mon Sep 17 00:00:00 2001 From: franpb14 Date: Sun, 23 Oct 2022 20:58:36 +0200 Subject: [PATCH 4/4] enum status and html adjustments --- app/controllers/petitions_controller.rb | 8 ++++---- app/models/petition.rb | 8 ++------ app/views/organizations/index.html.erb | 14 +++++++------- app/views/petitions/manage.html.erb | 20 ++++++++++---------- app/views/users/_form.html.erb | 11 +---------- 5 files changed, 24 insertions(+), 37 deletions(-) diff --git a/app/controllers/petitions_controller.rb b/app/controllers/petitions_controller.rb index 82b05c25b..c19ccea57 100644 --- a/app/controllers/petitions_controller.rb +++ b/app/controllers/petitions_controller.rb @@ -13,11 +13,11 @@ def create def update petition = Petition.find params[:id] - status = params[:status].to_i + status = params[:status] if petition.update(status: status) - User.find(params[:user_id]).add_to_organization(current_organization) if status == 1 - flash[:notice] = "Application #{Petition::STATUS[status]}" + User.find(params[:user_id]).add_to_organization(current_organization) if status == 'accepted' + flash[:notice] = "Application #{status}" else flash[:error] = 'Something went wrong' end @@ -26,7 +26,7 @@ def update end def manage - @status = params[:status].to_i + @status = params[:status] || 'pending' @users = User.joins(:petitions).where(petitions: { organization_id: current_organization.id, status: @status }).page(params[:page]).per(20) end diff --git a/app/models/petition.rb b/app/models/petition.rb index 3881b73df..24ad28376 100644 --- a/app/models/petition.rb +++ b/app/models/petition.rb @@ -1,10 +1,6 @@ class Petition < ApplicationRecord + enum status: %i[pending accepted declined] + belongs_to :user belongs_to :organization - - STATUS = { - 0 => 'pending', - 1 => 'accepted', - 2 => 'declined' - } end diff --git a/app/views/organizations/index.html.erb b/app/views/organizations/index.html.erb index 9cb499827..0e4a29d6b 100644 --- a/app/views/organizations/index.html.erb +++ b/app/views/organizations/index.html.erb @@ -27,7 +27,7 @@ <%= t '.neighborhood' %> <%= t '.web' %> <%= t '.member_count' %> - <%= ''.html_safe if current_user %> + @@ -38,15 +38,15 @@ <%= org.neighborhood %> <%= link_to(org.web, org.web) if org.web.present? %> <%= org.members.count %> - <% if current_user %> - + + <% if current_user %> <% if petition = current_user.petitions.where(organization_id: org.id).last %> - <%= Petition::STATUS[petition.status] %> + <%= petition.status %> <% else %> - <%= link_to 'Apply to join', petitions_path(user_id: current_user.id, organization_id: org.id, status: 0), method: :post %> + <%= link_to 'Apply to join', petitions_path(user_id: current_user.id, organization_id: org.id, status: 'pending'), method: :post %> <% end %> - - <% end %> + <% end %> + <% end %> diff --git a/app/views/petitions/manage.html.erb b/app/views/petitions/manage.html.erb index f40ec0926..71eb43146 100644 --- a/app/views/petitions/manage.html.erb +++ b/app/views/petitions/manage.html.erb @@ -12,20 +12,20 @@
      -
    • "> - <%= link_to manage_petitions_path(status: 0) do %> +
    • "> + <%= link_to manage_petitions_path(status: 'pending') do %> <%= glyph :minus %> <%= 'Pending applications' %> <% end %>
      • -
    • "> - <%= link_to manage_petitions_path(status: 1) do %> +
    • "> + <%= link_to manage_petitions_path(status: 'accepted') do %> <%= glyph :ok %> <%= 'Accepted applications' %> <% end %>
      • -
    • "> - <%= link_to manage_petitions_path(status: 2) do %> +
    • "> + <%= link_to manage_petitions_path(status: 'declined') do %> <%= glyph :remove %> <%= 'Declined applications' %> <% end %> @@ -46,7 +46,7 @@ <%= 'username' %> <%= User.human_attribute_name(:email) %> <%= User.human_attribute_name(:phone) %> - <% if current_user.manages?(current_organization) && @status == 0 %> + <% if current_user.manages?(current_organization) && @status == 'pending' %> <%= t(".actions") %> @@ -63,10 +63,10 @@ <%= user.username %> <%= user.email %> <%= phone_to user.phone %> - <% if current_user.manages?(current_organization) && @status == 0 %> + <% if current_user.manages?(current_organization) && @status == 'pending' %> - <%= link_to 'Accept', petition_path(id: petition.id, user_id: user.id, status: 1), class: 'btn btn-primary', method: :put %> - <%= link_to 'Decline', petition_path(id: petition.id, user_id: user.id, status: 2), class: 'btn btn-danger', method: :put %> + <%= link_to 'Accept', petition_path(id: petition.id, user_id: user.id, status: 'accepted'), class: 'btn btn-primary', method: :put %> + <%= link_to 'Decline', petition_path(id: petition.id, user_id: user.id, status: 'declined'), class: 'btn btn-danger', method: :put %> <% end %> <% end %> diff --git a/app/views/users/_form.html.erb b/app/views/users/_form.html.erb index d18b5765b..5b9de4058 100644 --- a/app/views/users/_form.html.erb +++ b/app/views/users/_form.html.erb @@ -12,16 +12,7 @@ <%= f.input :email, readonly: true %> <% end %> - <% if short %> -
      -
      - - lock - - <%= f.password_field :password, required: true, autofocus: true, placeholder: t("application.login_form.password"), class: "form-control input-lg" %> -
      -
      - <% end %> + <%= f.input :password, label: t("application.login_form.password"), required: true if short %> <%= f.input :phone %> <%= f.input :alt_phone %>