mirror of
https://github.com/rr-/szurubooru.git
synced 2025-07-17 08:26:24 +00:00
@ -130,6 +130,7 @@ privileges:
|
||||
'tag_categories:create': moderator
|
||||
'tag_categories:edit:name': moderator
|
||||
'tag_categories:edit:color': moderator
|
||||
'tag_categories:edit:order': moderator
|
||||
'tag_categories:list': anonymous
|
||||
'tag_categories:view': anonymous
|
||||
'tag_categories:delete': moderator
|
||||
|
@ -73,6 +73,11 @@ def update_tag_category(
|
||||
tag_categories.update_category_color(
|
||||
category, ctx.get_param_as_string("color")
|
||||
)
|
||||
if ctx.has_param("order"):
|
||||
auth.verify_privilege(ctx.user, "tag_categories:edit:order")
|
||||
tag_categories.update_category_order(
|
||||
category, ctx.get_param_as_int("order")
|
||||
)
|
||||
ctx.session.flush()
|
||||
snapshots.modify(category, ctx.user)
|
||||
ctx.session.commit()
|
||||
|
@ -48,6 +48,7 @@ class TagCategorySerializer(serialization.BaseSerializer):
|
||||
"color": self.serialize_color,
|
||||
"usages": self.serialize_usages,
|
||||
"default": self.serialize_default,
|
||||
"order": self.serialize_order,
|
||||
}
|
||||
|
||||
def serialize_name(self) -> Any:
|
||||
@ -65,6 +66,9 @@ class TagCategorySerializer(serialization.BaseSerializer):
|
||||
def serialize_default(self) -> Any:
|
||||
return self.category.default
|
||||
|
||||
def serialize_order(self) -> Any:
|
||||
return self.category.order
|
||||
|
||||
|
||||
def serialize_category(
|
||||
category: Optional[model.TagCategory], options: List[str] = []
|
||||
@ -117,6 +121,11 @@ def update_category_color(category: model.TagCategory, color: str) -> None:
|
||||
category.color = color
|
||||
|
||||
|
||||
def update_category_order(category: model.TagCategory, order: int) -> None:
|
||||
assert category
|
||||
category.order = order
|
||||
|
||||
|
||||
def try_get_category_by_name(
|
||||
name: str, lock: bool = False
|
||||
) -> Optional[model.TagCategory]:
|
||||
|
@ -67,6 +67,7 @@ def sort_tags(tags: List[model.Tag]) -> List[model.Tag]:
|
||||
return sorted(
|
||||
tags,
|
||||
key=lambda tag: (
|
||||
tag.category.order,
|
||||
default_category_name == tag.category.name,
|
||||
tag.category.name,
|
||||
tag.names[0].name,
|
||||
|
@ -0,0 +1,30 @@
|
||||
"""
|
||||
Add order column to tag categories.
|
||||
|
||||
Revision ID: c97dc1bf184a
|
||||
Created at: 2020-09-19 17:08:03.225667
|
||||
"""
|
||||
|
||||
import sqlalchemy as sa
|
||||
from alembic import op
|
||||
|
||||
revision = "c97dc1bf184a"
|
||||
down_revision = "54de8acc6cef"
|
||||
branch_labels = None
|
||||
depends_on = None
|
||||
|
||||
|
||||
def upgrade():
|
||||
op.add_column(
|
||||
"tag_category", sa.Column("order", sa.Integer, nullable=True)
|
||||
)
|
||||
op.execute(
|
||||
sa.table("tag_category", sa.column("order"))
|
||||
.update()
|
||||
.values(order=1)
|
||||
)
|
||||
op.alter_column("tag_category", "order", nullable=False)
|
||||
|
||||
|
||||
def downgrade():
|
||||
op.drop_column("tag_category", "order")
|
@ -16,6 +16,7 @@ class TagCategory(Base):
|
||||
"color", sa.Unicode(32), nullable=False, default="#000000"
|
||||
)
|
||||
default = sa.Column("default", sa.Boolean, nullable=False, default=False)
|
||||
order = sa.Column("order", sa.Integer, nullable=False, default=1)
|
||||
|
||||
def __init__(self, name: Optional[str] = None) -> None:
|
||||
self.name = name
|
||||
|
@ -17,6 +17,7 @@ def inject_config(config_injector):
|
||||
"privileges": {
|
||||
"tag_categories:edit:name": model.User.RANK_REGULAR,
|
||||
"tag_categories:edit:color": model.User.RANK_REGULAR,
|
||||
"tag_categories:edit:order": model.User.RANK_REGULAR,
|
||||
"tag_categories:set_default": model.User.RANK_REGULAR,
|
||||
},
|
||||
}
|
||||
|
Reference in New Issue
Block a user