Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
synapse
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD 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
Timo Ley
synapse
Commits
c7d46510
Commit
c7d46510
authored
7 years ago
by
Erik Johnston
Browse files
Options
Downloads
Patches
Plain Diff
Flake8
parent
ffd3f1a7
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
synapse/config/groups.py
+0
-4
0 additions, 4 deletions
synapse/config/groups.py
synapse/groups/groups_server.py
+4
-2
4 additions, 2 deletions
synapse/groups/groups_server.py
with
4 additions
and
6 deletions
synapse/config/groups.py
+
0
−
4
View file @
c7d46510
...
...
@@ -13,12 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from
synapse.util.module_loader
import
load_module
from
._base
import
Config
from
distutils.util
import
strtobool
class
GroupsConfig
(
Config
):
def
read_config
(
self
,
config
):
...
...
This diff is collapsed.
Click to expand it.
synapse/groups/groups_server.py
+
4
−
2
View file @
c7d46510
...
...
@@ -707,7 +707,9 @@ class GroupsServerHandler(object):
is_admin
=
yield
self
.
auth
.
is_server_admin
(
UserID
.
from_string
(
user_id
))
if
not
is_admin
:
if
not
self
.
hs
.
config
.
enable_group_creation
:
raise
SynapseError
(
403
,
"
Only server admin can create group on this server
"
)
raise
SynapseError
(
403
,
"
Only server admin can create group on this server
"
,
)
localpart
=
GroupID
.
from_string
(
group_id
).
localpart
if
not
localpart
.
startswith
(
self
.
hs
.
config
.
group_creation_prefix
):
raise
SynapseError
(
...
...
@@ -715,7 +717,7 @@ class GroupsServerHandler(object):
"
Can only create groups with prefix %r on this server
"
%
(
self
.
hs
.
config
.
group_creation_prefix
,
),
)
)
profile
=
content
.
get
(
"
profile
"
,
{})
name
=
profile
.
get
(
"
name
"
)
...
...
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