Fixed bug in messaging system. Moved navigation 'messages' to 'foodcoop' tab.
This commit is contained in:
parent
a29053b4e9
commit
a30444a602
2 changed files with 4 additions and 4 deletions
|
@ -37,7 +37,7 @@ class Message < ActiveRecord::Base
|
|||
# clean up the recipients_ids
|
||||
def before_validation_on_create
|
||||
self.recipients_ids = recipients_ids.uniq.reject { |id| id.blank? } unless recipients_ids.nil?
|
||||
self.recipients_ids = User.all.collect(&:id) if sent_to_all == 1
|
||||
self.recipients_ids = User.all.collect(&:id) if sent_to_all == "1"
|
||||
end
|
||||
|
||||
def add_recipients(users)
|
||||
|
|
|
@ -1,18 +1,18 @@
|
|||
<%
|
||||
u = @current_user
|
||||
tabs = [
|
||||
{ :name => "Start", :url => root_path, :active => ["index", "messages", "home"],
|
||||
{ :name => "Start", :url => root_path, :active => ["index", "home"],
|
||||
:subnav => [
|
||||
{ :name => "Nachrichten", :url => "/messages"},
|
||||
{ :name => "Meine Aufgaben", :url => "/home/tasks" },
|
||||
{ :name => "Meine Bestellgruppe", :url => "/home/ordergroup"},
|
||||
{ :name => "Mein Profil", :url => "/home/profile"}
|
||||
]
|
||||
},
|
||||
{ :name => "Foodcoop", :url => "/foodcoop/members", :active => ["foodcoop", "tasks"],
|
||||
{ :name => "Foodcoop", :url => "/foodcoop/members", :active => ["foodcoop", "tasks", "messages"],
|
||||
:subnav => [
|
||||
{ :name => "Mitglieder", :url => "/foodcoop/members"},
|
||||
{ :name => "Abeitsgruppen", :url => "/foodcoop/workgroups"},
|
||||
{ :name => "Nachrichten", :url => "/messages"},
|
||||
{ :name => "Aufgaben", :url => "/tasks"}
|
||||
]
|
||||
},
|
||||
|
|
Loading…
Reference in a new issue