Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Target

Show changes

Only incoming changes from source

Include changes to target after source was created

Commits on Source 3

Fix: Discipline label not showing · df5360bb
Petar Hristov authored 9 months ago

df5360bb
Merge branch 'Issue/3032-disciplines' into 'main' · 6f48fb85
Petar Hristov authored 9 months ago
```
Fix: Discipline label not showing

See merge request !477
```
6f48fb85

Chore: 3.13.1 · fa630f4f

CoscineBot authored 9 months ago

## [3.13.1](v3.13.0...v3.13.1) (2025-01-29)

### Fix

* Discipline label not showing ([df5360bb](df5360bb))

fa630f4f

package.json

+1
−1

Original line number
Original line
Diff line number
Diff line

{

{

  "name": "ui",

  "name": "ui",

  "version": "3.13.0",

  "version": "3.13.1",

  "scripts": {

  "scripts": {

    "dev": "vite",

    "dev": "vite",

    "build": "vite build",

    "build": "vite build",

src/modules/project/pages/components/FormMetadata.vue

+4
−0

Original line number
Original line
Diff line number
Diff line

@@ -511,6 +511,10 @@ const visibilities = computed(() => projectStore.visibilities ?? []);

const disciplines = computed(() => projectStore.disciplines ?? []);

const disciplines = computed(() => projectStore.disciplines ?? []);

const disciplineLabel = computed(() => {

const disciplineLabel = computed(() => {

  let locale = i18n.locale.value;

  let locale = i18n.locale.value;

  // Ensure that the value of locale is a valid locale, otherwie the property for disciplineLabel will be inaccurate

  if (i18n.availableLocales.includes(locale) === false) {

    locale = i18n.fallbackLocale.value.toString();

  }

  locale = locale.charAt(0).toUpperCase() + locale.slice(1);

  locale = locale.charAt(0).toUpperCase() + locale.slice(1);

  return `displayName${locale}`;

  return `displayName${locale}`;

});

});

src/modules/project/pages/components/data-publication/DataPublicationProjectData.vue

+4
−0

Original line number
Original line
Diff line number
Diff line

@@ -285,6 +285,10 @@ export default defineComponent({

    },

    },

    disciplineLabel(): string {

    disciplineLabel(): string {

      let locale = this.$i18n.locale;

      let locale = this.$i18n.locale;

      // Ensure that the value of locale is a valid locale, otherwie the property for disciplineLabel will be inaccurate

      if (this.$i18n.availableLocales.includes(locale) === false) {

        locale = this.$i18n.fallbackLocale.toString();

      }

      locale = locale.charAt(0).toUpperCase() + locale.slice(1);

      locale = locale.charAt(0).toUpperCase() + locale.slice(1);

      return `displayName${locale}`;

      return `displayName${locale}`;

    },

    },

src/modules/project/pages/components/data-publication/DataPublicationSummary.vue

+4
−0

Original line number
Original line
Diff line number
Diff line

@@ -180,6 +180,10 @@ export default defineComponent({

    },

    },

    disciplineLabel(): string {

    disciplineLabel(): string {

      let locale = this.$i18n.locale;

      let locale = this.$i18n.locale;

      // Ensure that the value of locale is a valid locale, otherwie the property for disciplineLabel will be inaccurate

      if (this.$i18n.availableLocales.includes(locale) === false) {

        locale = this.$i18n.fallbackLocale.toString();

      }

      locale = locale.charAt(0).toUpperCase() + locale.slice(1);

      locale = locale.charAt(0).toUpperCase() + locale.slice(1);

      return `displayName${locale}`;

      return `displayName${locale}`;

    },

    },

src/modules/resource/components/create-resource/ResourceMetadata.vue

+4
−0

Original line number
Original line
Diff line number
Diff line

@@ -376,6 +376,10 @@ const disciplines = computed(() => {

});

});

const disciplineLabel = computed(() => {

const disciplineLabel = computed(() => {

  let locale = i18n.locale.value;

  let locale = i18n.locale.value;

  // Ensure that the value of locale is a valid locale, otherwie the property for disciplineLabel will be inaccurate

  if (i18n.availableLocales.includes(locale) === false) {

    locale = i18n.fallbackLocale.value.toString();

  }

  locale = locale.charAt(0).toUpperCase() + locale.slice(1);

  locale = locale.charAt(0).toUpperCase() + locale.slice(1);

  return `displayName${locale}`;

  return `displayName${locale}`;

});

});

src/modules/user/pages/UserProfile.vue

+6
−4

Original line number
Original line
Diff line number
Diff line

@@ -476,11 +476,13 @@ export default defineComponent({

  },

  },

  computed: {

  computed: {

    disciplineLabel(): string {

    disciplineLabel(): string {

      if (this.$i18n.locale === "en") {

      let locale = this.$i18n.locale;

        return "displayNameEn";

      // Ensure that the value of locale is a valid locale, otherwie the property for disciplineLabel will be inaccurate

      } else {

      if (this.$i18n.availableLocales.includes(locale) === false) {

        return "displayNameDe";

        locale = this.$i18n.fallbackLocale.toString();

      }

      }

      locale = locale.charAt(0).toUpperCase() + locale.slice(1);

      return `displayName${locale}`;

    },

    },

    disciplines(): DisciplineDto[] {

    disciplines(): DisciplineDto[] {

      return this.userStore.userProfile.disciplines

      return this.userStore.userProfile.disciplines

Source

Target

Files