From 615d392d358e41a8a720540ba4f82b791c80cabe Mon Sep 17 00:00:00 2001 From: Sahiba Mittal Date: Tue, 30 Jul 2024 12:50:19 +0100 Subject: [PATCH 1/2] Show Badge For Inactive Projects Co-Authored-By: Aravind Parappil --- src/i18n/locales/de.json | 1 + src/i18n/locales/en.json | 1 + src/i18n/locales/es.json | 1 + src/i18n/locales/fr.json | 1 + src/i18n/locales/hi.json | 1 + src/i18n/locales/it.json | 1 + src/i18n/locales/ja.json | 1 + src/i18n/locales/pl.json | 1 + src/i18n/locales/pt-BR.json | 1 + src/i18n/locales/pt.json | 1 + src/i18n/locales/ru.json | 1 + src/i18n/locales/uk-UA.json | 1 + src/i18n/locales/zh.json | 1 + src/views/portfolio/projects/Project.vue | 28 ++++++++++++++++++++++-- 14 files changed, 39 insertions(+), 2 deletions(-) diff --git a/src/i18n/locales/de.json b/src/i18n/locales/de.json index f92d0b2c..f10da4ed 100644 --- a/src/i18n/locales/de.json +++ b/src/i18n/locales/de.json @@ -516,6 +516,7 @@ "in_triage": "In Triage", "inactive": "Inaktiv", "inactive_active_children": "Das Projekt kann nicht auf inaktiv gesetzt werden, wenn es aktive untergeordnete Projekte hat", + "inactive_versions": "Inaktive Versionen", "include_acl": "Zugriffskontrollliste einschließen", "include_audit_history": "Prüfverlauf einschließen", "include_components": "Komponenten einbinden", diff --git a/src/i18n/locales/en.json b/src/i18n/locales/en.json index ec0c22f5..42d25756 100644 --- a/src/i18n/locales/en.json +++ b/src/i18n/locales/en.json @@ -516,6 +516,7 @@ "in_triage": "In Triage", "inactive": "Inactive", "inactive_active_children": "The project cannot be set to inactive if it has active children", + "inactive_versions": "Inactive Versions", "include_acl": "Include access control list", "include_audit_history": "Include audit history", "include_components": "Include components", diff --git a/src/i18n/locales/es.json b/src/i18n/locales/es.json index 037e1785..1b0b6e46 100644 --- a/src/i18n/locales/es.json +++ b/src/i18n/locales/es.json @@ -516,6 +516,7 @@ "in_triage": "En triaje", "inactive": "Inactivo", "inactive_active_children": "El proyecto no se puede configurar como inactivo si tiene hijos activos", + "inactive_versions": "Versiones inactivas", "include_acl": "Incluir lista de control de acceso", "include_audit_history": "Incluir historial de auditoría", "include_components": "Incluir componentes", diff --git a/src/i18n/locales/fr.json b/src/i18n/locales/fr.json index d5fed3f7..d2d31868 100644 --- a/src/i18n/locales/fr.json +++ b/src/i18n/locales/fr.json @@ -516,6 +516,7 @@ "in_triage": "Au tri", "inactive": "Inactif", "inactive_active_children": "Le projet ne peut pas être défini comme inactif s'il a des enfants actifs", + "inactive_versions": "Versions inactives", "include_acl": "Inclure la liste de contrôle d'accès", "include_audit_history": "Inclure l'historique d'audit", "include_components": "Inclure les composants", diff --git a/src/i18n/locales/hi.json b/src/i18n/locales/hi.json index d9ed98d7..5d567ccc 100644 --- a/src/i18n/locales/hi.json +++ b/src/i18n/locales/hi.json @@ -516,6 +516,7 @@ "in_triage": "ट्राइएज में", "inactive": "निष्क्रिय", "inactive_active_children": "यदि प्रोजेक्ट में सक्रिय बच्चे हैं तो उसे निष्क्रिय नहीं किया जा सकता", + "inactive_versions": "निष्क्रिय संस्करण", "include_acl": "पहुँच नियंत्रण सूची शामिल करें", "include_audit_history": "ऑडिट इतिहास शामिल करें", "include_components": "घटक शामिल करें", diff --git a/src/i18n/locales/it.json b/src/i18n/locales/it.json index c98117ea..3dabd757 100644 --- a/src/i18n/locales/it.json +++ b/src/i18n/locales/it.json @@ -516,6 +516,7 @@ "in_triage": "Nel triage", "inactive": "Inattivo", "inactive_active_children": "Il progetto non può essere impostato su inattivo se ha figli attivi", + "inactive_versions": "Versioni inattive", "include_acl": "Includere l'elenco di controllo degli accessi", "include_audit_history": "Includere la cronologia degli audit", "include_components": "Includi componenti", diff --git a/src/i18n/locales/ja.json b/src/i18n/locales/ja.json index 120c2458..eb31e376 100644 --- a/src/i18n/locales/ja.json +++ b/src/i18n/locales/ja.json @@ -516,6 +516,7 @@ "in_triage": "トリアージ中", "inactive": "非活性", "inactive_active_children": "アクティブな子プロジェクトがある場合、プロジェクトを非アクティブに設定することはできません。", + "inactive_versions": "非アクティブなバージョン", "include_acl": "アクセス制御リストを含める", "include_audit_history": "監査履歴を含める", "include_components": "コンポーネントを含める", diff --git a/src/i18n/locales/pl.json b/src/i18n/locales/pl.json index 429f60dd..20459894 100644 --- a/src/i18n/locales/pl.json +++ b/src/i18n/locales/pl.json @@ -516,6 +516,7 @@ "in_triage": "W segregacji", "inactive": "Nieaktywny", "inactive_active_children": "Projektu nie można ustawić jako nieaktywnego, jeśli ma aktywne elementy podrzędne", + "inactive_versions": "Nieaktywne wersje", "include_acl": "Dołącz listę kontroli dostępu", "include_audit_history": "Dołącz historię audytu", "include_components": "Uwzględnij komponenty", diff --git a/src/i18n/locales/pt-BR.json b/src/i18n/locales/pt-BR.json index dfe4dbcf..265f9ef7 100644 --- a/src/i18n/locales/pt-BR.json +++ b/src/i18n/locales/pt-BR.json @@ -516,6 +516,7 @@ "in_triage": "Em triagem", "inactive": "Inativo", "inactive_active_children": "O projeto não pode ser definido como inativo se tiver filhos ativos", + "inactive_versions": "Versões inativas", "include_acl": "Incluir lista de controle de acesso", "include_audit_history": "Incluir histórico de auditoria", "include_components": "Incluir componentes", diff --git a/src/i18n/locales/pt.json b/src/i18n/locales/pt.json index bfaa43f4..42d4cc5b 100644 --- a/src/i18n/locales/pt.json +++ b/src/i18n/locales/pt.json @@ -516,6 +516,7 @@ "in_triage": "Em triagem", "inactive": "Inativo", "inactive_active_children": "O projeto não pode ser definido como inativo se tiver filhos ativos", + "inactive_versions": "Versões inativas", "include_acl": "Incluir lista de controle de acesso", "include_audit_history": "Incluir histórico de auditoria", "include_components": "Incluir componentes", diff --git a/src/i18n/locales/ru.json b/src/i18n/locales/ru.json index b2593e61..dd2e714c 100644 --- a/src/i18n/locales/ru.json +++ b/src/i18n/locales/ru.json @@ -516,6 +516,7 @@ "in_triage": "В сортировке", "inactive": "Неактивный", "inactive_active_children": "Проект нельзя сделать неактивным, если у него есть активные дочерние элементы.", + "inactive_versions": "Неактивные версии", "include_acl": "Включить список контроля доступа", "include_audit_history": "Включить историю аудита", "include_components": "Включить компоненты", diff --git a/src/i18n/locales/uk-UA.json b/src/i18n/locales/uk-UA.json index 9f04a007..5edee440 100644 --- a/src/i18n/locales/uk-UA.json +++ b/src/i18n/locales/uk-UA.json @@ -516,6 +516,7 @@ "in_triage": "В Triage", "inactive": "Неактивний", "inactive_active_children": "Проект не можна зробити неактивним, якщо він має активних дітей", + "inactive_versions": "Неактивні версії", "include_acl": "Додайте список контролю доступу", "include_audit_history": "Включіть історію аудиту", "include_components": "Включіть компоненти", diff --git a/src/i18n/locales/zh.json b/src/i18n/locales/zh.json index f91a6659..4a6feac0 100644 --- a/src/i18n/locales/zh.json +++ b/src/i18n/locales/zh.json @@ -516,6 +516,7 @@ "in_triage": "在分类中", "inactive": "不活跃", "inactive_active_children": "如果项目有活跃子项目，则不能将其设置为非活跃项目", + "inactive_versions": "非活动版本", "include_acl": "包括访问控制列表", "include_audit_history": "包括审计历史", "include_components": "包括组件", diff --git a/src/views/portfolio/projects/Project.vue b/src/views/portfolio/projects/Project.vue index b5978cb1..cb995b93 100644 --- a/src/views/portfolio/projects/Project.vue +++ b/src/views/portfolio/projects/Project.vue @@ -39,15 +39,33 @@ > @@ -376,6 +394,12 @@ export default { return this.project.name; } }, + activeProjectVersions() { + return this.project.versions.filter((version) => version.active); + }, + inactiveProjectVersions() { + return this.project.versions.filter((version) => !version.active); + }, }, data() { return { From 97544b400b858d49fa1c0878092e764024ee95fd Mon Sep 17 00:00:00 2001 From: Sahiba Mittal Date: Tue, 30 Jul 2024 13:06:44 +0100 Subject: [PATCH 2/2] project active field is not sortable --- src/views/portfolio/projects/ProjectList.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/portfolio/projects/ProjectList.vue b/src/views/portfolio/projects/ProjectList.vue index fe15bcf0..dc2e201c 100644 --- a/src/views/portfolio/projects/ProjectList.vue +++ b/src/views/portfolio/projects/ProjectList.vue @@ -330,7 +330,7 @@ export default { return value === true ? '' : ''; }, align: 'center', - sortable: true, + sortable: false, }, { title: this.$t('message.components'),