haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-20 10:58:33 +00:00
Code Issues Releases Wiki Activity

remove adjacent excess Divider (#5680)

Browse Source 
* remove adjacent excess 'Divider'

* fix upload file tags may cover previous tags
This commit is contained in:
Michael An
2023-10-11 20:40:16 +08:00
committed by GitHub
parent 7c6e2bf032
commit d4445fad51
3 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/src/components/popover/list-tag-popover.js
View File

@@ -46,8 +46,10 @@ export default class ListTagPopover extends React.Component {
}); });
}; };
updateTags = (repotagList) => { updateTags = (newRepotagList) => {
this.setState({ repotagList }); this.setState({
repotagList: [...this.state.repotagList, ...newRepotagList],
});
}; };
onDeleteTag = (tag) => { onDeleteTag = (tag) => {

2
frontend/src/models/repo-tag.js
View File

@@ -1,7 +1,7 @@
class RepoTag { class RepoTag {
constructor(object) { constructor(object) {
this.id = object.repo_tag_id; this.id = object.repo_tag_id;
this.fileCount = object.files_count; this.fileCount = object.files_count || 0;
this.name = object.tag_name; this.name = object.tag_name;
this.color = object.tag_color; this.color = object.tag_color;
} }

9
frontend/src/utils/utils.js
View File

@@ -639,6 +639,15 @@ export const Utils = {
if (list[list.length - 1] === 'Divider') { if (list[list.length - 1] === 'Divider') {
list.pop(); list.pop();
} }
// Remove adjacent excess 'Divider'
for (let i = 0; i < list.length; i++) {
if (list[i] === 'Divider' && list[i + 1] === 'Divider') {
list.splice(i, 1);
i--;
}
}
return list; return list;
}, },