Automatic Merge
Этот коммит содержится в:
Rodrigo Villablanca
2020-08-04 10:37:21 -04:00
коммит произвёл GitHub
родитель 7a4d31c583
Коммит 86290685ae
13 изменённых файлов: 289 добавлений и 274 удалений

Просмотреть файл

@@ -5085,7 +5085,7 @@ func (s *TimerLayerReactionStore) Save(reaction *model.Reaction) (*model.Reactio
return resultVar0, resultVar1
}
func (s *TimerLayerRoleStore) AllChannelSchemeRoles() ([]*model.Role, *model.AppError) {
func (s *TimerLayerRoleStore) AllChannelSchemeRoles() ([]*model.Role, error) {
start := timemodule.Now()
resultVar0, resultVar1 := s.RoleStore.AllChannelSchemeRoles()
@@ -5101,7 +5101,7 @@ func (s *TimerLayerRoleStore) AllChannelSchemeRoles() ([]*model.Role, *model.App
return resultVar0, resultVar1
}
func (s *TimerLayerRoleStore) ChannelHigherScopedPermissions(roleNames []string) (map[string]*model.RolePermissions, *model.AppError) {
func (s *TimerLayerRoleStore) ChannelHigherScopedPermissions(roleNames []string) (map[string]*model.RolePermissions, error) {
start := timemodule.Now()
resultVar0, resultVar1 := s.RoleStore.ChannelHigherScopedPermissions(roleNames)
@@ -5117,7 +5117,7 @@ func (s *TimerLayerRoleStore) ChannelHigherScopedPermissions(roleNames []string)
return resultVar0, resultVar1
}
func (s *TimerLayerRoleStore) ChannelRolesUnderTeamRole(roleName string) ([]*model.Role, *model.AppError) {
func (s *TimerLayerRoleStore) ChannelRolesUnderTeamRole(roleName string) ([]*model.Role, error) {
start := timemodule.Now()
resultVar0, resultVar1 := s.RoleStore.ChannelRolesUnderTeamRole(roleName)
@@ -5133,7 +5133,7 @@ func (s *TimerLayerRoleStore) ChannelRolesUnderTeamRole(roleName string) ([]*mod
return resultVar0, resultVar1
}
func (s *TimerLayerRoleStore) Delete(roleId string) (*model.Role, *model.AppError) {
func (s *TimerLayerRoleStore) Delete(roleId string) (*model.Role, error) {
start := timemodule.Now()
resultVar0, resultVar1 := s.RoleStore.Delete(roleId)
@@ -5149,7 +5149,7 @@ func (s *TimerLayerRoleStore) Delete(roleId string) (*model.Role, *model.AppErro
return resultVar0, resultVar1
}
func (s *TimerLayerRoleStore) Get(roleId string) (*model.Role, *model.AppError) {
func (s *TimerLayerRoleStore) Get(roleId string) (*model.Role, error) {
start := timemodule.Now()
resultVar0, resultVar1 := s.RoleStore.Get(roleId)
@@ -5165,7 +5165,7 @@ func (s *TimerLayerRoleStore) Get(roleId string) (*model.Role, *model.AppError)
return resultVar0, resultVar1
}
func (s *TimerLayerRoleStore) GetAll() ([]*model.Role, *model.AppError) {
func (s *TimerLayerRoleStore) GetAll() ([]*model.Role, error) {
start := timemodule.Now()
resultVar0, resultVar1 := s.RoleStore.GetAll()
@@ -5181,7 +5181,7 @@ func (s *TimerLayerRoleStore) GetAll() ([]*model.Role, *model.AppError) {
return resultVar0, resultVar1
}
func (s *TimerLayerRoleStore) GetByName(name string) (*model.Role, *model.AppError) {
func (s *TimerLayerRoleStore) GetByName(name string) (*model.Role, error) {
start := timemodule.Now()
resultVar0, resultVar1 := s.RoleStore.GetByName(name)
@@ -5197,7 +5197,7 @@ func (s *TimerLayerRoleStore) GetByName(name string) (*model.Role, *model.AppErr
return resultVar0, resultVar1
}
func (s *TimerLayerRoleStore) GetByNames(names []string) ([]*model.Role, *model.AppError) {
func (s *TimerLayerRoleStore) GetByNames(names []string) ([]*model.Role, error) {
start := timemodule.Now()
resultVar0, resultVar1 := s.RoleStore.GetByNames(names)
@@ -5213,7 +5213,7 @@ func (s *TimerLayerRoleStore) GetByNames(names []string) ([]*model.Role, *model.
return resultVar0, resultVar1
}
func (s *TimerLayerRoleStore) PermanentDeleteAll() *model.AppError {
func (s *TimerLayerRoleStore) PermanentDeleteAll() error {
start := timemodule.Now()
resultVar0 := s.RoleStore.PermanentDeleteAll()
@@ -5229,7 +5229,7 @@ func (s *TimerLayerRoleStore) PermanentDeleteAll() *model.AppError {
return resultVar0
}
func (s *TimerLayerRoleStore) Save(role *model.Role) (*model.Role, *model.AppError) {
func (s *TimerLayerRoleStore) Save(role *model.Role) (*model.Role, error) {
start := timemodule.Now()
resultVar0, resultVar1 := s.RoleStore.Save(role)