change media library layout;add perm

docs/docsrc/examples/examples_admin/media.go

@@ -28,7 +28,12 @@ func MediaExample(b *presets.Builder, db *gorm.DB) http.Handler {
 			}
 			if id == "" {
 				p := obj.(*media_library.MediaLibrary)
-				db.Save(&MediaRole{MediaID: p.ID, RoleName: "viewer"})
+				roleName := "viewer"
+				if p.Folder {
+					roleName = "viewer_folder"
+				}
+				db.Save(&MediaRole{MediaID: p.ID, RoleName: roleName})
+
 			}
 			return
 		}

docs/docsrc/examples/examples_admin/media_test.go

@@ -151,6 +151,33 @@ func TestMediaExample(t *testing.T) {
 				return
 			},
 		},
+		{
+			Name:  "create folder wrap saver",
+			Debug: true,
+			ReqFunc: func() *http.Request {
+				simpleMediaDate.TruncatePut(dbr)
+				req := multipartestutils.NewMultipartBuilder().
+					PageURL("/media-library").
+					Query(web.EventFuncIDName, media.CreateFolderEvent).
+					Query(media.ParamName, "folder_test").
+					BuildEventFuncRequest()
+				return req
+			},
+			EventResponseMatch: func(t *testing.T, er *multipartestutils.TestEventResponse) {
+				var m media_library.MediaLibrary
+				TestDB.Order("id desc").First(&m)
+				if m.File.FileName != "folder_test" {
+					t.Fatalf("except filename: folder_test but got %v", m.File.FileName)
+					return
+				}
+				var mr MediaRole
+				TestDB.Order("id desc").First(&mr)
+				if mr.RoleName != "viewer_folder" {
+					t.Fatalf("except rolename: viewer_folder but got %v", mr.RoleName)
+				}
+				return
+			},
+		},
 	}
 	for _, c := range cases {
 		t.Run(c.Name, func(t *testing.T) {

example/admin/perm.go

@@ -14,7 +14,6 @@ import (
 
 func initPermission(b *presets.Builder, db *gorm.DB) {
 	perm.Verbose = true
-
 	b.Permission(
 		perm.New().Policies(
 			perm.PolicyFor(perm.Anybody).WhoAre(perm.Allowed).ToDo(perm.Anything).On(perm.Anything),
@@ -25,7 +24,6 @@ func initPermission(b *presets.Builder, db *gorm.DB) {
 				models.RoleManager,
 			).WhoAre(perm.Denied).ToDo(presets.PermCreate, presets.PermUpdate, presets.PermDelete).On("*:roles:*", "*:users:*"),
 			perm.PolicyFor(models.RoleViewer).WhoAre(perm.Denied).ToDo(presets.PermCreate, presets.PermUpdate, presets.PermDelete).On(perm.Anything),
-
 			perm.PolicyFor(models.RoleManager).WhoAre(perm.Denied).ToDo(perm.Anything).
 				On("*:activity_logs").On("*:activity_logs:*").
 				Given(perm.Conditions{

example/integration/media_test.go

@@ -119,7 +119,7 @@ func TestMedia(t *testing.T) {
 					BuildEventFuncRequest()
 				return req
 			},
-			ExpectPortalUpdate0ContainsInOrder: []string{"v-dialog", "Choose Folder", "Root Director", "0_folder_portal_name"},
+			ExpectPortalUpdate0ContainsInOrder: []string{"v-dialog", "Choose Folder", "Root Directory", "0_folder_portal_name"},
 			ExpectPortalUpdate0NotContains:     []string{"test001"},
 		},
 		{
@@ -610,23 +610,8 @@ func TestMedia(t *testing.T) {
 					BuildEventFuncRequest()
 				return req
 			},
-			ExpectPortalUpdate0ContainsInOrder: []string{`showFileChooser:true`, "select_ids:[]", "v-checkbox"},
-		},
-		{
-			Name:  "Pages ChooseFileEvent Dialog  selected image",
-			Debug: true,
-			ReqFunc: func() *http.Request {
-				pageBuilderData.TruncatePut(dbr)
-				mediaTestData.TruncatePut(dbr)
-				req := NewMultipartBuilder().
-					PageURL("/pages").
-					Query(web.EventFuncIDName, media.OpenFileChooserEvent).
-					Query(media.ParamField, "media").
-					Query(media.ParamSelectIDS, "1").
-					BuildEventFuncRequest()
-				return req
-			},
-			ExpectPortalUpdate0ContainsInOrder: []string{`showFileChooser:true`, "select_ids:[1]", "v-checkbox"},
+			ExpectPortalUpdate0ContainsInOrder: []string{"select_ids:[]", "v-checkbox"},
+			ExpectPageBodyNotContains:          []string{"Save"},
 		},
 	}