seika/tagstudio
1
0
Fork 0
mirror of https://github.com/TagStudioDev/TagStudio.git synced 2024-07-30 21:27:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

ruff/mypy checks

Browse source
This commit is contained in:
Brady 2024-07-16 23:00:25 -04:00
parent 9cc62f73e8
commit 4c9313aab7
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
tagstudio/src/core/library.py
View file

@ -1899,12 +1899,9 @@ class Library:
source_tag_id: int = source_tag.id
target_tag_id: int = target_tag.id
if not source_tag or not target_tag:
return 0
if source_tag.name not in target_tag.aliases:
target_tag.aliases.append(source_tag.name)
for alias in source_tag.aliases:
if alias not in target_tag.aliases:
target_tag.aliases.append(alias)
@ -1912,7 +1909,7 @@ class Library:
for subtag_id in source_tag.subtag_ids:
if subtag_id not in target_tag.subtag_ids:
target_tag.subtag_ids.append(subtag_id)
for entry in self.entries:
for field in entry.fields:
if self.get_field_attr(field, "type") == "tag_box":

1
tagstudio/src/qt/widgets/tag.py
View file

@ -82,7 +82,6 @@ class TagWidget(QWidget):
merge_tag_action.triggered.connect(self.show_merge_tag_modal)
self.bg_button.addAction(merge_tag_action)
self.inner_layout = QHBoxLayout()
self.inner_layout.setObjectName("innerLayout")
self.inner_layout.setContentsMargins(2, 2, 2, 2)