diff --git a/frontend/src/components/dialog/create-tag-dialog.js b/frontend/src/components/dialog/create-tag-dialog.js index c5c038cc9f..fe37b4f690 100644 --- a/frontend/src/components/dialog/create-tag-dialog.js +++ b/frontend/src/components/dialog/create-tag-dialog.js @@ -53,7 +53,7 @@ class CreateTagDialog extends React.Component { if (error.response.status === 500) { errMessage = gettext('Internal Server Error'); } 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)); } this.setState({errorMsg: errMessage}); diff --git a/seahub/api2/endpoints/repo_tags.py b/seahub/api2/endpoints/repo_tags.py index 656dc181d5..059decd8c0 100644 --- a/seahub/api2/endpoints/repo_tags.py +++ b/seahub/api2/endpoints/repo_tags.py @@ -98,7 +98,7 @@ class RepoTagsView(APIView): error_msg = 'Library %s not found.' % repo_id 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: error_msg = 'repo tag %s already exist.' % tag_name return api_error(status.HTTP_400_BAD_REQUEST, error_msg) diff --git a/seahub/repo_tags/models.py b/seahub/repo_tags/models.py index 500bef3240..9f827cbacb 100644 --- a/seahub/repo_tags/models.py +++ b/seahub/repo_tags/models.py @@ -8,9 +8,9 @@ class RepoTagsManager(models.Manager): def get_all_by_repo_id(self, 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: - 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: return None