From 0aa7ecd5e89f054ae927b246f2aec4bd6348d42b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jes=C3=BAs=20Espino?= <jespinog@gmail.com>
Date: Fri, 9 Feb 2018 16:31:01 +0100
Subject: AllowEditPost and PostEditTimeLimit migration (#8208)

* AllowEditPost and PostEditTimeLimit migration

* Not set EDIT_POST permission to sysadmin_role if ALLOW_EDIT_POST is configured to NEVER

* Remove a bit of code duplication
---
 model/config.go | 2 +-
 model/role.go   | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'model')

diff --git a/model/config.go b/model/config.go
index 9010eaeae..8fb11d403 100644
--- a/model/config.go
+++ b/model/config.go
@@ -419,7 +419,7 @@ func (s *ServiceSettings) SetDefaults() {
 	}
 
 	if s.PostEditTimeLimit == nil {
-		s.PostEditTimeLimit = NewInt(300)
+		s.PostEditTimeLimit = NewInt(-1)
 	}
 
 	if s.EnablePreviewFeatures == nil {
diff --git a/model/role.go b/model/role.go
index 281304801..5f7352f12 100644
--- a/model/role.go
+++ b/model/role.go
@@ -182,7 +182,6 @@ func MakeDefaultRoles() map[string]*Role {
 			PERMISSION_UPLOAD_FILE.Id,
 			PERMISSION_GET_PUBLIC_LINK.Id,
 			PERMISSION_CREATE_POST.Id,
-			PERMISSION_EDIT_POST.Id,
 			PERMISSION_USE_SLASH_COMMANDS.Id,
 		},
 		SchemeManaged: true,
-- 
cgit v1.2.3-1-g7c22