Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Prevents listing inactive users on member list (#792) #799

Merged
merged 4 commits into from
Sep 14, 2015
Merged

Prevents listing inactive users on member list (#792) #799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
232287e
Avoid displaying inactive users during member list rendering (#792)
gmsecrieru Sep 14, 2015
76b0ab8
Added translations
gmsecrieru Sep 14, 2015
e933994
Merge branch 'master' of https://github.com/RocketChat/Rocket.Chat
gmsecrieru Sep 14, 2015
b1c1c57
Including active user condition for Private Groups auto complete
gmsecrieru Sep 14, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions client/views/app/sideNav/createChannelFlex.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ Template.createChannelFlex.helpers
$and: [
{ _id: { $ne: Meteor.userId() } }
{ username: { $nin: Template.instance().selectedUsers.get() } }
{ active: { $eq: true } }
]
sort: 'username'
}
Expand Down
1 change: 1 addition & 0 deletions client/views/app/sideNav/directMessagesFlex.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ Template.directMessagesFlex.helpers
filter:
type: 'u'
_id: { $ne: Meteor.userId() }
active: { $eq: true }
sort: 'username'
}
]
Expand Down
1 change: 1 addition & 0 deletions client/views/app/sideNav/privateGroupsFlex.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ Template.privateGroupsFlex.helpers
$and: [
{ _id: { $ne: Meteor.userId() } }
{ username: { $nin: Template.instance().selectedUsers.get() } }
{ active: { $eq: true } }
]
sort: 'username'
}
Expand Down
2 changes: 1 addition & 1 deletion client/views/app/tabBar/membersList.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ Template.membersList.helpers
template: Template.roomSearch
noMatchTemplate: Template.roomSearchEmpty
matchAll: true
filter: { type: 'u', uid: { $ne: Meteor.userId() } }
filter: { type: 'u', uid: { $ne: Meteor.userId() }, active: { $eq: true } }
sort: 'name'
}
]
Expand Down
4 changes: 4 additions & 0 deletions i18n/en.i18n.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
"Accounts_OAuth_Custom_Button_Label_Text" : "Button Text",
"Accounts_OAuth_Custom_Button_Label_Color" : "Button Text Color",
"Accounts_OAuth_Custom_Button_Color" : "Button Color",
"Activate" : "Activate",
"Add_Members" : "Add Members",
"Add_users" : "Add users",
"Administration" : "Administration",
Expand Down Expand Up @@ -77,7 +78,9 @@
"Create_new_public_channel" : "Create a new public channel",
"Created_at" : "Created at",
"days" : "days",
"Deactivate" : "Deactivate",
"Delete_User_Warning" : "Deleting a user will delete all messages from that user as well. This cannot be undone.",
"Delete" : "Delete",
"Deleted" : "Deleted!",
"Direct_Messages" : "Direct Messages",
"Disable_New_Message_Notification" : "Disable New Message Notification",
Expand All @@ -86,6 +89,7 @@
"Duplicate_channel_name" : "A Channel with name '%s' exists",
"Duplicate_private_group_name" : "A Private Group with name '%s' exists",
"E-mail" : "E-mail",
"Edit" : "Edit",
"edited" : "edited",
"Email_already_exists" : "Email already exists",
"Email_or_username" : "Email or username",
Expand Down
7 changes: 7 additions & 0 deletions i18n/pt.i18n.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
"Accounts_OAuth_Custom_Button_Label_Text" : "Texto do botão",
"Accounts_OAuth_Custom_Button_Label_Color" : "Cor do texto do botão",
"Accounts_OAuth_Custom_Button_Color" : "Cor do botão",
"Activate" : "Ativar",
"Add_Members" : "Adicionar membros",
"Add_users" : "Adicionar usuários",
"Administration" : "Administração",
Expand Down Expand Up @@ -75,7 +76,9 @@
"Create_new_public_channel" : "Criar um canal público",
"Created_at" : "Data criação",
"days" : "dias",
"Deactivate" : "Desativar",
"Delete_User_Warning" : "Excluir um usuário irá apagar todas as mensagens desse usuário também. Isso não poderá ser desfeito.",
"Delete" : "Deletar",
"Deleted" : "Deletado!",
"Direct_Messages" : "Mensagens Diretas",
"Disable_New_Message_Notification" : "Desativar notificações de nova mensagem",
Expand All @@ -84,6 +87,7 @@
"Duplicate_channel_name" : "Já existe um Canal com nome '%s'",
"Duplicate_private_group_name" : "Já existe um Grupo Privado com nome '%s'",
"E-mail" : "E-mail",
"Edit" : "Editar",
"edited" : "editado",
"Email_already_exists" : "Email já cadastrado",
"Email_or_username" : "Email ou nome de usuário",
Expand Down Expand Up @@ -222,6 +226,7 @@
"Remove_Admin" : "Remover Administrador",
"Reset_password" : "Resetar senha",
"Room" : "Sala",
"Rooms" : "Salas",
"Room_name_changed" : "Nome da sala alterado para: <em>__room_name__</em> por <em>__user_by__</em>",
"Room_name_changed_successfully" : "Nome da sala alterado com sucesso",
"Room_not_found" : "Sala não encontrada",
Expand Down Expand Up @@ -252,6 +257,7 @@
"SMTP_Username" : "Nome de usuário SMTP",
"Sound" : "Som",
"Start_of_conversation" : "Início da conversa",
"Statistics" : "Estatísticas",
"Stats_Active_Users" : "Usuários Ativos",
"Stats_Avg_Channel_Users" : "Média de Usuários por Canal",
"Stats_Avg_Private_Group_Users" : "Média de Usuários por Grupo Privado",
Expand Down Expand Up @@ -311,6 +317,7 @@
"Username_invalid" : "<strong>%s</strong> não é um nome de usuário válido, <br/> usar somente letras, números, pontos e traços",
"Username_title" : "Cadastre um nome de usuário",
"Username_unavaliable" : "<strong>%s</strong> já está sendo usado :(",
"Users" : "Usuários",
"View_All" : "Ver Todos",
"Wait_activation_warning" : "Antes que você possa fazer o login, sua conta deve ser manualmente ativada por um administrador.",
"We_have_sent_password_email" : "Nós lhe enviamos um e-mail com instruções para redefinir sua senha. Se você não receber um e-mail em breve, por favor retorne e tente novamente.",
Expand Down