Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
Rocket.Chat
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
RocketChat
Rocket.Chat
Commits
5a72c5a1
Commit
5a72c5a1
authored
9 years ago
by
Olivier Beddows
Browse files
Options
Downloads
Patches
Plain Diff
Fixing 'undefined' button titles.
parent
78c7822c
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
client/views/admin/users/adminUsers.coffee
+4
-4
4 additions, 4 deletions
client/views/admin/users/adminUsers.coffee
packages/rocketchat-lib/client/lib/openRoom.coffee
+4
-4
4 additions, 4 deletions
packages/rocketchat-lib/client/lib/openRoom.coffee
with
8 additions
and
8 deletions
client/views/admin/users/adminUsers.coffee
+
4
−
4
View file @
5a72c5a1
...
...
@@ -37,7 +37,7 @@ Template.adminUsers.onCreated ->
@
filter
=
new
ReactiveVar
''
@
ready
=
new
ReactiveVar
true
RocketChat
.
TabBar
.
addButton
({
id
:
'invite-user'
,
t
itle
:
t
(
'Invite_Users'
),
icon
:
'icon-plus'
,
template
:
'adminInviteUser'
,
order
:
1
})
RocketChat
.
TabBar
.
addButton
({
id
:
'invite-user'
,
i18nT
itle
:
t
(
'Invite_Users'
),
icon
:
'icon-plus'
,
template
:
'adminInviteUser'
,
order
:
1
})
@
autorun
->
filter
=
instance
.
filter
.
get
()
...
...
@@ -49,11 +49,11 @@ Template.adminUsers.onCreated ->
if
Session
.
get
'adminSelectedUser'
channelSubscription
=
instance
.
subscribe
'userChannels'
,
Session
.
get
'adminSelectedUser'
RocketChat
.
TabBar
.
setData
Meteor
.
users
.
findOne
Session
.
get
'adminSelectedUser'
RocketChat
.
TabBar
.
addButton
({
id
:
'user-info'
,
t
itle
:
t
(
'User_Info'
),
icon
:
'icon-user'
,
template
:
'adminUserInfo'
,
order
:
2
})
# RocketChat.TabBar.addButton({ id: 'user-channel',
t
itle: t('User_Channels'), icon: 'icon-hash', template: 'adminUserChannels', order: 3 })
RocketChat
.
TabBar
.
addButton
({
id
:
'user-info'
,
i18nT
itle
:
t
(
'User_Info'
),
icon
:
'icon-user'
,
template
:
'adminUserInfo'
,
order
:
2
})
# RocketChat.TabBar.addButton({ id: 'user-channel',
i18nT
itle: t('User_Channels'), icon: 'icon-hash', template: 'adminUserChannels', order: 3 })
else
RocketChat
.
TabBar
.
reset
()
RocketChat
.
TabBar
.
addButton
({
id
:
'invite-user'
,
t
itle
:
t
(
'Invite_Users'
),
icon
:
'icon-plus'
,
template
:
'adminInviteUser'
,
order
:
1
})
RocketChat
.
TabBar
.
addButton
({
id
:
'invite-user'
,
i18nT
itle
:
t
(
'Invite_Users'
),
icon
:
'icon-plus'
,
template
:
'adminInviteUser'
,
order
:
1
})
@
users
=
->
filter
=
_
.
trim
instance
.
filter
?
.
get
()
...
...
This diff is collapsed.
Click to expand it.
packages/rocketchat-lib/client/lib/openRoom.coffee
+
4
−
4
View file @
5a72c5a1
...
...
@@ -51,12 +51,12 @@ currentTracker = undefined
,
100
RocketChat
.
TabBar
.
resetButtons
()
RocketChat
.
TabBar
.
addButton
({
id
:
'message-search'
,
t
itle
:
t
(
'Search'
),
icon
:
'octicon octicon-search'
,
template
:
'messageSearch'
,
order
:
1
})
RocketChat
.
TabBar
.
addButton
({
id
:
'message-search'
,
i18nT
itle
:
t
(
'Search'
),
icon
:
'octicon octicon-search'
,
template
:
'messageSearch'
,
order
:
1
})
if
type
is
'd'
RocketChat
.
TabBar
.
addButton
({
id
:
'members-list'
,
t
itle
:
t
(
'User_Info'
),
icon
:
'octicon octicon-person'
,
template
:
'membersList'
,
order
:
2
})
RocketChat
.
TabBar
.
addButton
({
id
:
'members-list'
,
i18nT
itle
:
t
(
'User_Info'
),
icon
:
'octicon octicon-person'
,
template
:
'membersList'
,
order
:
2
})
else
RocketChat
.
TabBar
.
addButton
({
id
:
'members-list'
,
t
itle
:
t
(
'Members_List'
),
icon
:
'octicon octicon-organization'
,
template
:
'membersList'
,
order
:
2
})
RocketChat
.
TabBar
.
addButton
({
id
:
'uploaded-files-list'
,
t
itle
:
t
(
'Room_uploaded_file_list'
),
icon
:
'octicon octicon-file-symlink-directory'
,
template
:
'uploadedFilesList'
,
order
:
3
})
RocketChat
.
TabBar
.
addButton
({
id
:
'members-list'
,
i18nT
itle
:
t
(
'Members_List'
),
icon
:
'octicon octicon-organization'
,
template
:
'membersList'
,
order
:
2
})
RocketChat
.
TabBar
.
addButton
({
id
:
'uploaded-files-list'
,
i18nT
itle
:
t
(
'Room_uploaded_file_list'
),
icon
:
'octicon octicon-file-symlink-directory'
,
template
:
'uploadedFilesList'
,
order
:
3
})
# update user's room subscription
if
ChatSubscription
.
findOne
({
rid
:
room
.
_id
})
?
.
open
is
false
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment