diff options
| author | Kir | 2012-02-15 20:00:44 +0200 |
|---|---|---|
| committer | Kir | 2012-02-15 20:00:44 +0200 |
| commit | 0b60dd51919da68a4da3c59fe7e2f736527c45ad (patch) | |
| tree | 373298a1db945ca20d364c1ee6e4f3fff644024d | |
| parent | 90d8da2777e6c2a93a03fa3c16833c2156c46553 (diff) | |
| download | inboxes-0b60dd51919da68a4da3c59fe7e2f736527c45ad.tar.bz2 | |
Adding posability to remove discussion
| -rw-r--r-- | app/controllers/inboxes/discussions_controller.rb | 11 | ||||
| -rw-r--r-- | config/locales/en.yml | 1 | ||||
| -rw-r--r-- | config/locales/ru.yml | 1 |
3 files changed, 13 insertions, 0 deletions
diff --git a/app/controllers/inboxes/discussions_controller.rb b/app/controllers/inboxes/discussions_controller.rb index 8074274..d23f5a5 100644 --- a/app/controllers/inboxes/discussions_controller.rb +++ b/app/controllers/inboxes/discussions_controller.rb @@ -13,6 +13,17 @@ class Inboxes::DiscussionsController < Inboxes::BaseController def new @discussion.messages.build end + + def destroy + @discussion.destroy + + flash[:notice] = t("inboxes.discussions.removed") + begin + redirect_to :back + rescue ActionController::RedirectBackError + redirect_to discussions_url + end + end def create @discussion.add_recipient_token current_user.id diff --git a/config/locales/en.yml b/config/locales/en.yml index a9a810d..83834bd 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -8,6 +8,7 @@ en: added: "Speaker was added to discussion" removed: "Speaker was removed from discussion" discussions: + removed: "Discussion removed" started: "Discussion started" leaved: "You leave the discussion" already_exists: "Discussion between you and %{user} already exists" diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 1e311cd..0ca47c3 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -12,6 +12,7 @@ ru: already_exists: "Дискуссия между вами и %{user} уже существует" can_not_participate: "Вы не состоите в этой дискуссии" choose_at_least_one_recipient: "Укажите хотя бы одного получателя" + removed: "Переписка удалена" speakers: added: "Собеседник успешно добавлен" removed: "Собеседник удален"
\ No newline at end of file |