IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into PLT-1429

Browse Source
This commit is contained in:
=Corey Hulen
2016-01-14 09:08:13 -06:00
parent 0b986ed314 a341dbad2b
commit 6d6cada097
104 changed files with 1941 additions and 848 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
store/sql_channel_store.go
View File

@@ -603,7 +603,14 @@ func (s SqlChannelStore) GetExtraMembers(channelId string, limit int) StoreChann
result := StoreResult{}
var members []model.ExtraMember
_, err := s.GetReplica().Select(&members, "SELECT Id, Nickname, Email, ChannelMembers.Roles, Username FROM ChannelMembers, Users WHERE ChannelMembers.UserId = Users.Id AND ChannelId = :ChannelId LIMIT :Limit", map[string]interface{}{"ChannelId": channelId, "Limit": limit})
var err error
if limit != -1 {
_, err = s.GetReplica().Select(&members, "SELECT Id, Nickname, Email, ChannelMembers.Roles, Username FROM ChannelMembers, Users WHERE ChannelMembers.UserId = Users.Id AND ChannelId = :ChannelId LIMIT :Limit", map[string]interface{}{"ChannelId": channelId, "Limit": limit})
} else {
_, err = s.GetReplica().Select(&members, "SELECT Id, Nickname, Email, ChannelMembers.Roles, Username FROM ChannelMembers, Users WHERE ChannelMembers.UserId = Users.Id AND ChannelId = :ChannelId", map[string]interface{}{"ChannelId": channelId})
}
if err != nil {
result.Err = model.NewAppError("SqlChannelStore.GetExtraMembers", "We couldn't get the extra info for channel members", "channel_id="+channelId+", "+err.Error())
} else {

2
store/sql_preference_store.go
View File

@@ -4,7 +4,7 @@
package store
import (
l4g "code.google.com/p/log4go"
l4g "github.com/alecthomas/log4go"
"github.com/go-gorp/gorp"
"github.com/mattermost/platform/model"
"github.com/mattermost/platform/utils"

2
store/sql_session_store.go
View File

@@ -4,7 +4,7 @@
package store
import (
l4g "code.google.com/p/log4go"
l4g "github.com/alecthomas/log4go"
"github.com/mattermost/platform/model"
)

2
store/sql_store.go
View File

@@ -4,7 +4,6 @@
package store
import (
l4g "code.google.com/p/log4go"
"crypto/aes"
"crypto/cipher"
"crypto/hmac"
@@ -16,6 +15,7 @@ import (
"encoding/json"
"errors"
"fmt"
l4g "github.com/alecthomas/log4go"
"io"
sqltrace "log"
"math/rand"

2
store/store.go
View File

@@ -4,7 +4,7 @@
package store
import (
l4g "code.google.com/p/log4go"
l4g "github.com/alecthomas/log4go"
"github.com/mattermost/platform/model"
"time"
)