diff --git a/frontend/components/modals/ChannelModal.vue b/frontend/components/modals/projects/ChannelModal.vue similarity index 100% rename from frontend/components/modals/ChannelModal.vue rename to frontend/components/modals/projects/ChannelModal.vue diff --git a/frontend/layouts/default.vue b/frontend/layouts/default.vue index 92b9ac789..88c25f473 100644 --- a/frontend/layouts/default.vue +++ b/frontend/layouts/default.vue @@ -19,6 +19,7 @@ diff --git a/frontend/pages/_author/_slug/channels.vue b/frontend/pages/_author/_slug/channels.vue index 799d46289..a9f155eaf 100644 --- a/frontend/pages/_author/_slug/channels.vue +++ b/frontend/pages/_author/_slug/channels.vue @@ -67,7 +67,7 @@ import { ProjectChannel } from 'hangar-internal'; import { Context } from '@nuxt/types'; import { HangarProjectMixin } from '~/components/mixins'; import Tag from '~/components/Tag.vue'; -import ChannelModal from '~/components/modals/ChannelModal.vue'; +import ChannelModal from '~/components/modals/projects/ChannelModal.vue'; import { ProjectPermission } from '~/utils/perms'; import { NamedPermission } from '~/types/enums'; diff --git a/frontend/pages/_author/_slug/settings.vue b/frontend/pages/_author/_slug/settings.vue index 1a71def11..309aab5c2 100644 --- a/frontend/pages/_author/_slug/settings.vue +++ b/frontend/pages/_author/_slug/settings.vue @@ -304,7 +304,7 @@ - +

{{ $t('project.settings.hardDelete') }}

@@ -378,7 +378,6 @@ prepend-inner-icon="mdi-file-word-box" />
- @@ -660,5 +659,6 @@ h2 { .v-window-item { padding-left: 10px; + padding-right: 10px; } diff --git a/frontend/pages/_author/_slug/versions/new.vue b/frontend/pages/_author/_slug/versions/new.vue index bccecfa9e..acf7da70c 100644 --- a/frontend/pages/_author/_slug/versions/new.vue +++ b/frontend/pages/_author/_slug/versions/new.vue @@ -189,7 +189,7 @@ import { HangarProjectMixin } from '~/components/mixins'; import { ProjectPermission } from '~/utils/perms'; import { NamedPermission, Platform } from '~/types/enums'; import { MarkdownEditor } from '~/components/markdown'; -import ChannelModal from '~/components/modals/ChannelModal.vue'; +import ChannelModal from '~/components/modals/projects/ChannelModal.vue'; import { RootState } from '~/store'; import DependencyTable from '~/components/modals/versions/DependencyTable.vue'; diff --git a/src/main/java/io/papermc/hangar/model/api/project/ProjectLicense.java b/src/main/java/io/papermc/hangar/model/api/project/ProjectLicense.java index 33048a8f8..81354e65f 100644 --- a/src/main/java/io/papermc/hangar/model/api/project/ProjectLicense.java +++ b/src/main/java/io/papermc/hangar/model/api/project/ProjectLicense.java @@ -19,7 +19,10 @@ public class ProjectLicense { @JdbiConstructor public ProjectLicense(@Nullable String name, @Nullable String url) { int index = config.getLicenses().indexOf(name); - if (name != null && index > -1 && index < config.getLicenses().size() - 1) { + if (name == null) { + this.type = null; + this.name = null; + } else if (index > -1 && index < config.getLicenses().size() - 1) { this.name = null; this.type = name; } else {