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

Merge pull request #3357 from haiwen/fix-tag

Browse Source 
change translation
This commit is contained in:
Daniel Pan
2019-04-24 15:31:16 +08:00
committed by GitHub
parent e9201be344 08e774e056
commit 88a86409d3
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/components/dialog/create-tag-dialog.js
View File

@@ -53,7 +53,7 @@ class CreateTagDialog extends React.Component {
if (error.response.status === 500) { if (error.response.status === 500) {
errMessage = gettext('Internal Server Error'); errMessage = gettext('Internal Server Error');
} else if (error.response.status === 400) { } else if (error.response.status === 400) {
errMessage = gettext('Repo tag "{name}" is already exist.'); errMessage = gettext('Tag "{name}" already exists.');
errMessage = errMessage.replace('{name}', Utils.HTMLescape(name)); errMessage = errMessage.replace('{name}', Utils.HTMLescape(name));
} }
this.setState({errorMsg: errMessage}); this.setState({errorMsg: errMessage});

2
seahub/api2/endpoints/repo_tags.py
View File

@@ -98,7 +98,7 @@ class RepoTagsView(APIView):
error_msg = 'Library %s not found.' % repo_id error_msg = 'Library %s not found.' % repo_id
return api_error(status.HTTP_404_NOT_FOUND, error_msg) return api_error(status.HTTP_404_NOT_FOUND, error_msg)
repo_tag = RepoTags.objects.get_one_repo_tag(repo_id, tag_name, tag_color) repo_tag = RepoTags.objects.get_repo_tag_by_name(repo_id, tag_name)
if repo_tag: if repo_tag:
error_msg = 'repo tag %s already exist.' % tag_name error_msg = 'repo tag %s already exist.' % tag_name
return api_error(status.HTTP_400_BAD_REQUEST, error_msg) return api_error(status.HTTP_400_BAD_REQUEST, error_msg)

4
seahub/repo_tags/models.py
View File

@@ -8,9 +8,9 @@ class RepoTagsManager(models.Manager):
def get_all_by_repo_id(self, repo_id): def get_all_by_repo_id(self, repo_id):
return super(RepoTagsManager, self).filter(repo_id=repo_id) return super(RepoTagsManager, self).filter(repo_id=repo_id)
def get_one_repo_tag(self, repo_id, tag_name, tag_color): def get_repo_tag_by_name(self, repo_id, tag_name):
try: try:
return super(RepoTagsManager, self).get(repo_id=repo_id, name=tag_name, color=tag_color) return super(RepoTagsManager, self).get(repo_id=repo_id, name=tag_name)
except self.model.DoesNotExist: except self.model.DoesNotExist:
return None return None