Revert "Allow creation of map folders restricted to admins only. (#1175…

…)" (#1198)

This reverts commit 13734cc.

pyplanet/apps/contrib/jukebox/folders.py

@@ -60,8 +60,8 @@ async def get_folders(self, player):
 		raw_list = await Folders.objects.execute(
 			Folders.select(Folders, Player)
 				.join(Player)
-				.where(((Player.login == player.login) & ((Folders.visibility == 'private') | (player.level >= player.LEVEL_ADMIN))) | (Folders.visibility == 'public'))
-				.order_by(Folders.visibility.desc())
+				.where((Player.login == player.login) | (Folders.public == True))
+				.order_by(Folders.public.desc())
 		)
 
 		# Convert to the wanted objects.
@@ -73,7 +73,7 @@ async def get_folders(self, player):
 			folder_list.append(
 				{
 					'id': folder_id, 'name': folder.name, 'owner_login': folder.player.login,
-					'owner': folder.player.nickname, 'type': folder.visibility
+					'owner': folder.player.nickname, 'type': 'public' if folder.public else 'private'
 				}
 			)
 
@@ -90,7 +90,7 @@ async def get_private_folders(self, player):
 		return await Folders.objects.execute(
 			Folders.select(Folders, Player)
 				.join(Player)
-				.where((Player.login == player.login) & (Folders.visibility == 'private'))
+				.where((Player.login == player.login) & (Folders.public == False))
 		)
 
 	async def get_writable_folders(self, player):
@@ -105,13 +105,13 @@ async def get_writable_folders(self, player):
 			return await Folders.objects.execute(
 				Folders.select(Folders, Player)
 					.join(Player)
-					.where((Player.login == player.login) | (Folders.visibility == 'public' or Folders.visibility == 'admins_only'))
+					.where((Player.login == player.login) | (Folders.public == True))
 			)
 
 		return await Folders.objects.execute(
 			Folders.select(Folders, Player)
 				.join(Player)
-				.where((Player.login == player.login) & (Folders.visibility == 'private'))
+				.where((Player.login == player.login))
 		)
 
 	async def create_folder(self, **kwargs):

pyplanet/apps/contrib/jukebox/models/mapfolder.py

@@ -20,21 +20,15 @@ class MapFolder(TimedModel):
 	Folder name
 	"""
 
-	visibility = CharField(
-		max_length=50,
-		null=False,
-		default='private'
-	)
+	public = BooleanField()
 	"""
-	Visibility of the folder (public, private, admin_only).
+	Is folder public (only for admins)?
 	"""
 
 	@property
 	def icon(self):
-		if self.visibility == 'public':
+		if self.public:
 			return '\uf0c0'
-		elif self.visibility == 'admins_only':
-			return '\uf0c1'
 		return '\uf023'
 
 

pyplanet/apps/contrib/jukebox/templates/folder_create.Script.Txt

@@ -5,7 +5,6 @@ declare Entry_AdminStatus_Value <=> (Page.GetFirstChild("folder_is_admin") as CM
 
 declare Quad_FolderPrivacy_Public_Boolean <=> (Page.GetFirstChild("folder_privacy_public") as CMlQuad);
 declare Quad_FolderPrivacy_Private_Boolean <=> (Page.GetFirstChild("folder_privacy_private") as CMlQuad);
-declare Quad_FolderPrivacy_AdminsOnly_Boolean <=> (Page.GetFirstChild("folder_privacy_admins_only") as CMlQuad);
 
 while(True) {
   foreach (Event in PendingEvents) {
@@ -14,29 +13,15 @@ while(True) {
       if (Entry_AdminStatus_Value.Value == "1") {
         // Uncheck other one.
         Quad_FolderPrivacy_Private_Boolean.StyleSelected = False;
-        Quad_FolderPrivacy_AdminsOnly_Boolean.StyleSelected = False;
         Quad_FolderPrivacy_Public_Boolean.StyleSelected = True;
 
         Entry_FolderPrivacy_Value.Value = "public";
       }
     }
 
-    if (Event.Type == CMlScriptEvent::Type::MouseClick && Event.ControlId == "folder_privacy_admins_only") {
-      // Check Admin status
-      if (Entry_AdminStatus_Value.Value == "1") {
-        // Uncheck other one.
-        Quad_FolderPrivacy_Private_Boolean.StyleSelected = False;
-        Quad_FolderPrivacy_AdminsOnly_Boolean.StyleSelected = True;
-        Quad_FolderPrivacy_Public_Boolean.StyleSelected = False;
-
-        Entry_FolderPrivacy_Value.Value = "admins_only";
-      }
-    }
-
     if (Event.Type == CMlScriptEvent::Type::MouseClick && Event.ControlId == "folder_privacy_private") {
       // Uncheck other one.
       Quad_FolderPrivacy_Private_Boolean.StyleSelected = True;
-      Quad_FolderPrivacy_AdminsOnly_Boolean.StyleSelected = False;
       Quad_FolderPrivacy_Public_Boolean.StyleSelected = False;
 
       Entry_FolderPrivacy_Value.Value = "private";

pyplanet/apps/contrib/jukebox/templates/folder_create.xml

@@ -25,9 +25,6 @@
 
       <quad pos="0 -10" id="folder_privacy_public" size="5 5" style="Icons64x64_1" substyle="Check" styleselected="0" valign="top" scriptevents="1" />
       <label pos="10 -11" size="100 5" text="$fff$oPublic, readable by everyone, writable by admins. (only for admins)" textsize="1.1" valign="top" />
-
-      <quad pos="0 -15" id="folder_privacy_admins_only" size="5 5" style="Icons64x64_1" substyle="Check" styleselected="0" valign="top" scriptevents="1" />
-      <label pos="10 -16" size="100 5" text="$fff$oAdmins only, visible and writable for admins. (only for admins)" textsize="1.1" valign="top" />
     </frame>
 
     <label pos="30 -100" style="CardButtonMedium" valign="center" halign="center"

pyplanet/apps/contrib/jukebox/views.py

@@ -356,8 +356,8 @@ async def get_data(self):
 
 	async def remove_from_folder(self, player, values, map_dictionary, view, **kwargs):
 		# Check permission on folder.
-		if (self.folder_instance.visibility != 'private' and player.level < player.LEVEL_ADMIN)\
-			or (self.folder_instance.visibility == 'private' and self.folder_instance.player_id != player.id):
+		if (self.folder_instance.public and player.level < player.LEVEL_ADMIN)\
+			or (not self.folder_instance.public and self.folder_instance.player_id != player.id):
 			await show_alert(player, 'You are not allowed to remove the map from the folder!', size='sm')
 			return
 
@@ -383,7 +383,6 @@ async def get_buttons(self):
 		buttons = await super().get_buttons()
 
 		if (self.folder_code['type'] == 'public' and self.player.level >= self.player.LEVEL_ADMIN) \
-			or (self.folder_code['type'] == 'admins_only' and self.player.level >= self.player.LEVEL_ADMIN) \
 			or (self.folder_code['type'] == 'public' and self.folder_code['owner_login'] == self.player.login) \
 			or (self.folder_code['type'] == 'private' and self.folder_code['owner_login'] == self.player.login):
 			buttons.append({
@@ -485,19 +484,9 @@ def render_folder_name(row, field):
 			icon = '\uf0c0'
 		elif row['type'] == 'private':
 			icon = '\uf023'
-		elif row['type'] == 'admins_only':
-			icon = '\uf0c1'
 
 		return '{} {}'.format(icon, row[field['index']])
 
-	@staticmethod
-	def render_type(row, field):
-		type_name = row['type'].capitalize()
-		if type_name == 'Admins_only':
-			type_name = 'Admins only'
-
-		return type_name
-
 	async def get_fields(self):
 		return [
 			{
@@ -516,7 +505,8 @@ async def get_fields(self):
 				'sorting': True,
 				'searching': False,
 				'width': 30,
-				'renderer': self.render_type,
+				'renderer': lambda row, field:
+					row[field['index']].capitalize(),
 				'type': 'label'
 			},
 			{
@@ -672,7 +662,7 @@ async def save(self, player, action, values, *args, **kwargs):
 		folder_name = values['folder_name']
 		folder_privacy = values['folder_privacy']
 
-		if folder_privacy != 'private' and player.level < player.LEVEL_ADMIN:
+		if folder_privacy == 'public' and player.level < player.LEVEL_ADMIN:
 			folder_privacy = 'private'
 
 		# Check if the user has already created 5 private folders
@@ -689,7 +679,7 @@ async def save(self, player, action, values, *args, **kwargs):
 			return await show_alert(player, 'The name you gave is not valid. Please provide a name with at least 3 characters.', 'sm')
 
 		# Create folder.
-		await self.folder_manager.create_folder(name=folder_name, player=player, visibility=folder_privacy)
+		await self.folder_manager.create_folder(name=folder_name, player=player, public=folder_privacy == 'public')
 
 		# Return response.
 		self.response_future.set_result(None)
@@ -762,9 +752,9 @@ async def handle_catch_all(self, player, action, values, **kwargs):
 			return  # Ignore exceptions here, could be that the folder has been deleted recently.
 
 		# Check permission on folder.
-		if folder.visibility != 'private' and player.level < player.LEVEL_ADMIN:
+		if folder.public and player.level < player.LEVEL_ADMIN:
 			return
-		if folder.visibility == 'private' and folder.player_id != player.id:
+		if not folder.public and folder.player_id != player.id:
 			return
 
 		# Add map to folder.