Skip to content

Commit

Permalink
fix: 修复权限申请内容国际化问题
Browse files Browse the repository at this point in the history
  • Loading branch information
benero committed Aug 14, 2024
1 parent 5e6b9d6 commit d6ea51c
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 7 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.6.28
2.6.29
2 changes: 1 addition & 1 deletion app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ author: 蓝鲸智云
category: 办公应用
introduction: 流程服务是蓝鲸推出的轻量级ITSM,通过可自定义设计的流程模块,覆盖IT服务中的不同管理活动或应用场景。帮助企业用户规范内部管理流程,提升沟通及管理效率。
introduction_en: bk_itsm is a lightweight ITSM created by Blueking. It covers different application scenarios in IT services through customizable workflows and help enterprise users to implement standardize IT workflow, improve communication and management efficiency.
version: 2.6.28
version: 2.6.29
language: python
is_use_celery: True
is_use_celery_with_gevent: False
Expand Down
2 changes: 1 addition & 1 deletion app_desc.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
spec_version: 2
app_version: "2.6.28"
app_version: "2.6.29"
app:
region: default
bk_app_code: bk_itsm
Expand Down
3 changes: 3 additions & 0 deletions docs/RELEASE.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
# Changelog
## [Version: 2.6.29] - 2024-08-14
【修复】修复权限申请内容国际化问题

## [Version: 2.6.28] - 2024-08-08
【修复】修复表单提交XSS漏洞

Expand Down
4 changes: 4 additions & 0 deletions docs/RELEASE_EN.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
# Changelog

## [Version: 2.6.29] - 2024-08-14
【Fixed】Fix the internationalization issue in permission application content.

## [Version: 2.6.28] - 2024-08-08
【Fixed】Fix the XSS vulnerability in form submission.

Expand Down
8 changes: 4 additions & 4 deletions itsm/component/constants/iam.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
"""
from django.utils.translation import ugettext as _
from settings import BK_IAM_SYSTEM_ID
from django.conf import settings
from django.utils.translation import gettext_lazy as _

BK_IAM_SYSTEM_ID = BK_IAM_SYSTEM_ID
BK_IAM_SYSTEM_ID = settings.BK_IAM_SYSTEM_ID
ACTIONS = [
{
"id": "project_create",
Expand Down Expand Up @@ -520,7 +520,7 @@
{"id": "task_template", "name": _("任务模版"), "parent_id": None},
]

BK_IAM_SYSTEM_NAME = "流程服务"
BK_IAM_SYSTEM_NAME = _("流程服务")

HTTP_499_IAM_FORBIDDEN = 499

Expand Down

0 comments on commit d6ea51c

Please sign in to comment.