Compare commits
No commits in common. "541fec20ca27740f980e0f0724fd71e370bb4e69" and "bc7c2c7867411c2f700358ff764db44e434ba74f" have entirely different histories.
541fec20ca
...
bc7c2c7867
8 changed files with 1 additions and 46 deletions
|
@ -61,4 +61,4 @@ $safety-sketchy = #F3D75F
|
||||||
$safety-unsafe = #F3985F
|
$safety-unsafe = #F3985F
|
||||||
$scrollbar-thumb-color = $main-color
|
$scrollbar-thumb-color = $main-color
|
||||||
$scrollbar-bg-color = $input-enabled-background-color
|
$scrollbar-bg-color = $input-enabled-background-color
|
||||||
$transparency-grid-square-color = #F0F0F0
|
$transparency-grid-square-color = #00000000
|
||||||
|
|
|
@ -53,7 +53,6 @@
|
||||||
<div class='post-container'></div>
|
<div class='post-container'></div>
|
||||||
|
|
||||||
<div class='after-mobile-controls'>
|
<div class='after-mobile-controls'>
|
||||||
<div class='description'></div>
|
|
||||||
<% if (ctx.canCreateComments) { %>
|
<% if (ctx.canCreateComments) { %>
|
||||||
<h2>Add comment</h2>
|
<h2>Add comment</h2>
|
||||||
<div class='comment-form-container'></div>
|
<div class='comment-form-container'></div>
|
||||||
|
|
|
@ -187,9 +187,6 @@ class PostMainController extends BasePostController {
|
||||||
if (e.detail.source !== undefined && e.detail.source !== null) {
|
if (e.detail.source !== undefined && e.detail.source !== null) {
|
||||||
post.source = e.detail.source;
|
post.source = e.detail.source;
|
||||||
}
|
}
|
||||||
if (e.detail.desc !== undefined && e.detail.desc !== null) {
|
|
||||||
post.desc = e.detail.desc;
|
|
||||||
}
|
|
||||||
post.save().then(
|
post.save().then(
|
||||||
() => {
|
() => {
|
||||||
this._view.sidebarControl.showSuccess("Post saved.");
|
this._view.sidebarControl.showSuccess("Post saved.");
|
||||||
|
|
|
@ -114,10 +114,6 @@ class Post extends events.EventTarget {
|
||||||
return this._notes;
|
return this._notes;
|
||||||
}
|
}
|
||||||
|
|
||||||
get desc() {
|
|
||||||
return this._desc;
|
|
||||||
}
|
|
||||||
|
|
||||||
get comments() {
|
get comments() {
|
||||||
return this._comments;
|
return this._comments;
|
||||||
}
|
}
|
||||||
|
@ -281,9 +277,6 @@ class Post extends events.EventTarget {
|
||||||
if (this._source !== this._orig._source) {
|
if (this._source !== this._orig._source) {
|
||||||
detail.source = this._source;
|
detail.source = this._source;
|
||||||
}
|
}
|
||||||
if (this._desc !== this._orig._desc) {
|
|
||||||
detail.desc = this._desc;
|
|
||||||
}
|
|
||||||
|
|
||||||
let apiPromise = this._id
|
let apiPromise = this._id
|
||||||
? api.put(uri.formatApiLink("post", this.id), detail, files)
|
? api.put(uri.formatApiLink("post", this.id), detail, files)
|
||||||
|
|
|
@ -103,7 +103,6 @@ privileges:
|
||||||
'posts:edit:content': power
|
'posts:edit:content': power
|
||||||
'posts:edit:flags': regular
|
'posts:edit:flags': regular
|
||||||
'posts:edit:notes': regular
|
'posts:edit:notes': regular
|
||||||
'posts:edit:desc': regular
|
|
||||||
'posts:edit:relations': regular
|
'posts:edit:relations': regular
|
||||||
'posts:edit:safety': power
|
'posts:edit:safety': power
|
||||||
'posts:edit:source': regular
|
'posts:edit:source': regular
|
||||||
|
|
|
@ -72,7 +72,6 @@ def create_post(
|
||||||
source = ctx.get_param_as_string("contentUrl", default="")
|
source = ctx.get_param_as_string("contentUrl", default="")
|
||||||
relations = ctx.get_param_as_int_list("relations", default=[])
|
relations = ctx.get_param_as_int_list("relations", default=[])
|
||||||
notes = ctx.get_param_as_list("notes", default=[])
|
notes = ctx.get_param_as_list("notes", default=[])
|
||||||
desc = ctx.get_param_as_string("desc", default="")
|
|
||||||
flags = ctx.get_param_as_string_list(
|
flags = ctx.get_param_as_string_list(
|
||||||
"flags", default=posts.get_default_flags(content)
|
"flags", default=posts.get_default_flags(content)
|
||||||
)
|
)
|
||||||
|
@ -86,7 +85,6 @@ def create_post(
|
||||||
posts.update_post_source(post, source)
|
posts.update_post_source(post, source)
|
||||||
posts.update_post_relations(post, relations)
|
posts.update_post_relations(post, relations)
|
||||||
posts.update_post_notes(post, notes)
|
posts.update_post_notes(post, notes)
|
||||||
posts.update_post_desc(post, desc)
|
|
||||||
posts.update_post_flags(post, flags)
|
posts.update_post_flags(post, flags)
|
||||||
if ctx.has_file("thumbnail"):
|
if ctx.has_file("thumbnail"):
|
||||||
posts.update_post_thumbnail(post, ctx.get_file("thumbnail"))
|
posts.update_post_thumbnail(post, ctx.get_file("thumbnail"))
|
||||||
|
@ -161,9 +159,6 @@ def update_post(ctx: rest.Context, params: Dict[str, str]) -> rest.Response:
|
||||||
if ctx.has_param("notes"):
|
if ctx.has_param("notes"):
|
||||||
auth.verify_privilege(ctx.user, "posts:edit:notes")
|
auth.verify_privilege(ctx.user, "posts:edit:notes")
|
||||||
posts.update_post_notes(post, ctx.get_param_as_list("notes"))
|
posts.update_post_notes(post, ctx.get_param_as_list("notes"))
|
||||||
if ctx.has_param("desc"):
|
|
||||||
auth.verify_privilege(ctx.user, "posts:edit:desc")
|
|
||||||
posts.update_post_desc(post, ctx.get_param_as_string("desc"))
|
|
||||||
if ctx.has_param("flags"):
|
if ctx.has_param("flags"):
|
||||||
auth.verify_privilege(ctx.user, "posts:edit:flags")
|
auth.verify_privilege(ctx.user, "posts:edit:flags")
|
||||||
posts.update_post_flags(post, ctx.get_param_as_string_list("flags"))
|
posts.update_post_flags(post, ctx.get_param_as_string_list("flags"))
|
||||||
|
|
|
@ -197,7 +197,6 @@ class PostSerializer(serialization.BaseSerializer):
|
||||||
"favoritedBy": self.serialize_favorited_by,
|
"favoritedBy": self.serialize_favorited_by,
|
||||||
"hasCustomThumbnail": self.serialize_has_custom_thumbnail,
|
"hasCustomThumbnail": self.serialize_has_custom_thumbnail,
|
||||||
"notes": self.serialize_notes,
|
"notes": self.serialize_notes,
|
||||||
"desc": self.serialize_desc,
|
|
||||||
"comments": self.serialize_comments,
|
"comments": self.serialize_comments,
|
||||||
"pools": self.serialize_pools,
|
"pools": self.serialize_pools,
|
||||||
}
|
}
|
||||||
|
@ -329,9 +328,6 @@ class PostSerializer(serialization.BaseSerializer):
|
||||||
key=lambda x: x["polygon"],
|
key=lambda x: x["polygon"],
|
||||||
)
|
)
|
||||||
|
|
||||||
def serialize_desc(self) -> Any:
|
|
||||||
return self.post.desc
|
|
||||||
|
|
||||||
def serialize_comments(self) -> Any:
|
def serialize_comments(self) -> Any:
|
||||||
return [
|
return [
|
||||||
comments.serialize_comment(comment, self.auth_user)
|
comments.serialize_comment(comment, self.auth_user)
|
||||||
|
@ -783,11 +779,6 @@ def update_post_notes(post: model.Post, notes: Any) -> None:
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
def update_post_desc(post: model.Post, desc: str) -> None:
|
|
||||||
assert post
|
|
||||||
post.desc = desc
|
|
||||||
|
|
||||||
|
|
||||||
def update_post_flags(post: model.Post, flags: List[str]) -> None:
|
def update_post_flags(post: model.Post, flags: List[str]) -> None:
|
||||||
assert post
|
assert post
|
||||||
target_flags = []
|
target_flags = []
|
||||||
|
|
|
@ -111,22 +111,6 @@ class PostNote(Base):
|
||||||
post = sa.orm.relationship("Post")
|
post = sa.orm.relationship("Post")
|
||||||
|
|
||||||
|
|
||||||
class PostDesc(Base):
|
|
||||||
__tablename__ = "post_desc"
|
|
||||||
|
|
||||||
post_desc_id = sa.Column("id", sa.Integer, primary_key=True)
|
|
||||||
post_id = sa.Column(
|
|
||||||
"post_id",
|
|
||||||
sa.Integer,
|
|
||||||
sa.ForeignKey("post.id"),
|
|
||||||
nullable=False,
|
|
||||||
index=True,
|
|
||||||
)
|
|
||||||
text = sa.Column("text", sa.UnicodeText, nullable=False)
|
|
||||||
|
|
||||||
post = sa.orm.relationship("Post")
|
|
||||||
|
|
||||||
|
|
||||||
class PostRelation(Base):
|
class PostRelation(Base):
|
||||||
__tablename__ = "post_relation"
|
__tablename__ = "post_relation"
|
||||||
|
|
||||||
|
@ -268,9 +252,6 @@ class Post(Base):
|
||||||
notes = sa.orm.relationship(
|
notes = sa.orm.relationship(
|
||||||
"PostNote", cascade="all, delete-orphan", lazy="joined"
|
"PostNote", cascade="all, delete-orphan", lazy="joined"
|
||||||
)
|
)
|
||||||
desc = sa.orm.relationship(
|
|
||||||
"PostDesc", cascade="all, delete-orphan", lazy="joined"
|
|
||||||
)
|
|
||||||
comments = sa.orm.relationship("Comment", cascade="all, delete-orphan")
|
comments = sa.orm.relationship("Comment", cascade="all, delete-orphan")
|
||||||
_pools = sa.orm.relationship(
|
_pools = sa.orm.relationship(
|
||||||
"PoolPost",
|
"PoolPost",
|
||||||
|
|
Reference in a new issue