From 5ead67f88cfd82b573142745eca6885f297544cc Mon Sep 17 00:00:00 2001 From: wvengen Date: Wed, 30 Oct 2013 20:46:59 +0100 Subject: [PATCH] remove unused memberships controller/view --- app/controllers/memberships_controller.rb | 33 ------------------- .../shared/memberships/_current_members.rhtml | 21 ------------ app/views/shared/memberships/_members.rhtml | 23 ------------- .../shared/memberships/_non_members.rhtml | 11 ------- config/locales/de.yml | 13 -------- config/locales/en.yml | 13 -------- config/locales/fr.yml | 13 -------- config/locales/nl.yml | 13 -------- 8 files changed, 140 deletions(-) delete mode 100644 app/controllers/memberships_controller.rb delete mode 100644 app/views/shared/memberships/_current_members.rhtml delete mode 100644 app/views/shared/memberships/_members.rhtml delete mode 100644 app/views/shared/memberships/_non_members.rhtml diff --git a/app/controllers/memberships_controller.rb b/app/controllers/memberships_controller.rb deleted file mode 100644 index e8373675..00000000 --- a/app/controllers/memberships_controller.rb +++ /dev/null @@ -1,33 +0,0 @@ -class MembershipsController < ApplicationController - before_filter :authenticate_membership_or_admin - - def add_member - user = User.find(params[:user_id]) - Membership.create(:group => @group, :user => user) - redirect_to :action => 'reload', :id => @group - end - - def drop_member - begin - Membership.find(params[:membership_id]).destroy - if User.find(@current_user.id).role_admin? - redirect_to :action => 'reload', :id => @group - else - # If the user drops himself from admin group - flash[:notice] = MESG_NO_ADMIN_ANYMORE - render(:update) {|page| page.redirect_to :controller => "index"} - end - rescue => error - flash[:error] = error.to_s - redirect_to :action => 'reload', :id => @group - end - end - - def reload - render :update do |page| - page.replace_html 'members', :partial => 'shared/memberships/current_members', :object => @group - page.replace_html 'non_members', :partial => 'shared/memberships/non_members', :object => @group - end - end - -end diff --git a/app/views/shared/memberships/_current_members.rhtml b/app/views/shared/memberships/_current_members.rhtml deleted file mode 100644 index 81aab3a0..00000000 --- a/app/views/shared/memberships/_current_members.rhtml +++ /dev/null @@ -1,21 +0,0 @@ -<% if flash[:error] %> -

<%= flash[:error] %>

- <%= javascript_tag("new Effect.Highlight('flashError', {delay:0.8, duration:1});") -%> -<% end %> - -<% memberships = @group.memberships - if memberships.size != 0 %> - - <% else %> -

<%= t('.no_members', group: @group.name) %>

- <% end %> diff --git a/app/views/shared/memberships/_members.rhtml b/app/views/shared/memberships/_members.rhtml deleted file mode 100644 index 55a35452..00000000 --- a/app/views/shared/memberships/_members.rhtml +++ /dev/null @@ -1,23 +0,0 @@ -

<%=h t('.title', group: @group.name) %>

-

- <%= t('.desc', link: remote_link_to(t('.invite'), :url => new_invite_path(:id => @group))).html_safe %> -

-
-
-

<%= t('.already_members') %>

-
-
- <%=render :partial => 'shared/memberships/current_members' %> -
-
-
-
-

<%= t('.no_members_yet') %>

-
-
- <%= render :partial => 'shared/memberships/non_members' %> - <%= remote_link_to(t('.invite_someone'), :url => new_invite_path(:id => @group)) %> -
-
- - diff --git a/app/views/shared/memberships/_non_members.rhtml b/app/views/shared/memberships/_non_members.rhtml deleted file mode 100644 index 2e177bc2..00000000 --- a/app/views/shared/memberships/_non_members.rhtml +++ /dev/null @@ -1,11 +0,0 @@ - diff --git a/config/locales/de.yml b/config/locales/de.yml index fc164a7c..49449c49 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -1378,19 +1378,6 @@ de: homepage_title: Foodcoop Homepage besuchen logout: Abmelden profile: Profil - memberships: - current_members: - drop: entfernen - no_members: ! '%{group} hat keine Mitglieder.' - members: - already_members: Sind schon Mitglieder - desc: Hier kannst Du Mitglieder der Gruppe verwalten oder ein neues Foodcoop-Mitglied in die Gruppe %{link}. - invite: einladen - invite_someone: Person einladen - no_members_yet: Sind noch keine Mitglieder - title: Mitglieder von %{group} - non_members: - add: hinzufügen open_orders: ending: Ende no_open_orders: Derzeit gibt es keine laufenden Bestellungen diff --git a/config/locales/en.yml b/config/locales/en.yml index 34aca236..39f7e2dd 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1382,19 +1382,6 @@ en: homepage_title: Visit Foodcoop Homepage logout: Logout profile: Profile - memberships: - current_members: - drop: remove - no_members: ! '%{group} has no members.' - members: - already_members: Are already members - desc: Here you can manage members of the group or invite a new Foodcoop-member to the group %{link}. - invite: invite - invite_someone: Invite someone - no_members_yet: Are not members yet - title: Members of %{group} - non_members: - add: add open_orders: ending: Ending no_open_orders: There are no current orders diff --git a/config/locales/fr.yml b/config/locales/fr.yml index d064380a..4ea843d3 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -1385,19 +1385,6 @@ fr: homepage_title: Vers la page d'accueil de la bouffecoop logout: Te déconnecter profile: Profil - memberships: - current_members: - drop: désinscrire - no_members: ! '%{group} n''a aucun membre pour le moment.' - members: - already_members: Sont déjà membre - desc: Sur cette page, tu peux gérer les membres de l'équipe, et aussi %{link} un nouveau membre. - invite: engrainer - invite_someone: Inviter quelqu'unE - no_members_yet: Ne sont pas encore membre - title: Membre de %{group} - non_members: - add: ajouter open_orders: ending: Clôture le no_open_orders: Il n'y a aucune commande en cours en ce moment diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 2252563a..570fe68d 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -1312,19 +1312,6 @@ nl: homepage_title: Foodcoop startpagina bezoeken logout: Uitloggen profile: Profiel - memberships: - current_members: - drop: verwijderen - no_members: ! '%{group} heeft geen leden.' - members: - already_members: Zijn al lid - desc: - invite: uitnodiging - invite_someone: Iemand uitnodigen - no_members_yet: Zijn nog geen lid - title: Leden van %{group} - non_members: - add: toevoegen open_orders: ending: Einde no_open_orders: Er zijn momenteel geen lopende bestellingen.