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

Sync more changes from branch more-streams #4513

Merged
merged 5 commits into from
Oct 1, 2016
Merged

Sync more changes from branch more-streams #4513

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a6088d2
More sync with `more-streams`
rodrigok Oct 1, 2016
7a9869e
Use super instead of _initModel for models
rodrigok Oct 1, 2016
3b78971
Change file encoding
rodrigok Oct 1, 2016
9700095
Fix last commit
rodrigok Oct 1, 2016
9147be9
Fix data find
rodrigok Oct 1, 2016
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
2 changes: 1 addition & 1 deletion packages/rocketchat-authorization/server/models/Permissions.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
RocketChat.models.Permissions = new class extends RocketChat.models._Base
constructor: ->
@_initModel 'permissions'
super('permissions')

# FIND
findByRole: (role, options) ->
Expand Down
2 changes: 1 addition & 1 deletion packages/rocketchat-authorization/server/models/Roles.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
RocketChat.models.Roles = new class extends RocketChat.models._Base
constructor: ->
@_initModel 'roles'
super('roles')
@tryEnsureIndex { 'name': 1 }
@tryEnsureIndex { 'scope': 1 }

Expand Down
2 changes: 1 addition & 1 deletion packages/rocketchat-channel-settings/server/functions/saveRoomName.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
RocketChat.saveRoomName = (rid, name, user) ->
RocketChat.saveRoomName = (rid, name) ->
room = RocketChat.models.Rooms.findOneById rid

if room.t not in ['c', 'p']
Expand Down
3 changes: 1 addition & 2 deletions packages/rocketchat-emoji-custom/server/models/EmojiCustom.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
class EmojiCustom extends RocketChat.models._Base {
constructor() {
super();
this._initModel('custom_emoji');
super('custom_emoji');

this.tryEnsureIndex({ 'name': 1 });
this.tryEnsureIndex({ 'aliases': 1 });
Expand Down
2 changes: 1 addition & 1 deletion packages/rocketchat-highlight-words/client.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ class HighlightWordsClient
message.html = msg
return message

RocketChat.callbacks.add 'renderMessage', HighlightWordsClient, RocketChat.callbacks.priority.MEDIUM, 'highlight-words'
RocketChat.callbacks.add 'renderMessage', HighlightWordsClient, RocketChat.callbacks.priority.MEDIUM + 1, 'highlight-words'
2 changes: 1 addition & 1 deletion packages/rocketchat-importer/server/models/Imports.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Importer.Imports = new class Importer.Imports extends RocketChat.models._Base
constructor: ->
@_initModel 'import'
super('import')
2 changes: 1 addition & 1 deletion packages/rocketchat-importer/server/models/RawImports.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Importer.RawImports = new class Importer.RawImports extends RocketChat.models._Base
constructor: ->
@_initModel 'raw_imports'
super('raw_imports')
2 changes: 1 addition & 1 deletion packages/rocketchat-integrations/server/models/Integrations.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
RocketChat.models.Integrations = new class extends RocketChat.models._Base
constructor: ->
@_initModel 'integrations'
super('integrations')


# FIND
Expand Down
Loading