From e25c71f33ad152417739f74edaa5fbcf3178459c Mon Sep 17 00:00:00 2001
From: KennyTV <jahnke.nassim@gmail.com>
Date: Thu, 1 Oct 2020 10:33:37 +0200
Subject: [PATCH] Fixes in project creation

---
 src/main/frontend/src/js/projectDetail.js                   | 6 +++---
 .../service/plugindata/handler/PaperPluginFileHandler.java  | 2 +-
 .../service/plugindata/handler/VelocityFileHandler.java     | 2 +-
 .../plugindata/handler/WaterfallPluginFileHandler.java      | 2 +-
 src/main/resources/templates/projects/versions/create.ftlh  | 2 +-
 src/main/resources/templates/projects/view.ftlh             | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/frontend/src/js/projectDetail.js b/src/main/frontend/src/js/projectDetail.js
index 2db5f4d20..f3f36a764 100644
--- a/src/main/frontend/src/js/projectDetail.js
+++ b/src/main/frontend/src/js/projectDetail.js
@@ -6,7 +6,7 @@ import { decodeHtml, numberWithCommas, toggleSpinner } from '@/utils';
 
 const PROJECT_OWNER = window.PROJECT_OWNER;
 const PROJECT_SLUG = window.PROJECT_SLUG;
-const PROJECT_ID = window.PROJECT_ID;
+const NAMESPACE = window.NAMESPACE;
 const ALREADY_STARRED = window.ALREADY_STARRED;
 
 const ACTIVE_NAV = window.ACTIVE_NAV;
@@ -235,8 +235,8 @@ $(function () {
         increment *= -1;
     });
 
-    if (PROJECT_ID) {
-        apiV2Request('projects/' + PROJECT_ID).then((response) => {
+    if (NAMESPACE) {
+        apiV2Request('projects/' + NAMESPACE).then((response) => {
             if (response.promoted_versions) {
                 let html = '';
                 response.promoted_versions.forEach((version) => {
diff --git a/src/main/java/io/papermc/hangar/service/plugindata/handler/PaperPluginFileHandler.java b/src/main/java/io/papermc/hangar/service/plugindata/handler/PaperPluginFileHandler.java
index d40ab0f60..9a285ec66 100644
--- a/src/main/java/io/papermc/hangar/service/plugindata/handler/PaperPluginFileHandler.java
+++ b/src/main/java/io/papermc/hangar/service/plugindata/handler/PaperPluginFileHandler.java
@@ -29,7 +29,7 @@ public class PaperPluginFileHandler extends FileTypeHandler {
             return result;
         }
 
-        String version = (String) data.get("version");
+        String version = String.valueOf(data.get("version"));
         if (version != null) {
             result.add(new DataValue.StringDataValue("version", version));
         }
diff --git a/src/main/java/io/papermc/hangar/service/plugindata/handler/VelocityFileHandler.java b/src/main/java/io/papermc/hangar/service/plugindata/handler/VelocityFileHandler.java
index d1d703e75..47699e6ef 100644
--- a/src/main/java/io/papermc/hangar/service/plugindata/handler/VelocityFileHandler.java
+++ b/src/main/java/io/papermc/hangar/service/plugindata/handler/VelocityFileHandler.java
@@ -29,7 +29,7 @@ public class VelocityFileHandler extends FileTypeHandler {
             return result;
         }
 
-        String version = (String) data.get("version");
+        String version = String.valueOf(data.get("version"));
         if (version != null) {
             result.add(new DataValue.StringDataValue("version", version));
         }
diff --git a/src/main/java/io/papermc/hangar/service/plugindata/handler/WaterfallPluginFileHandler.java b/src/main/java/io/papermc/hangar/service/plugindata/handler/WaterfallPluginFileHandler.java
index 551575f17..ac294a818 100644
--- a/src/main/java/io/papermc/hangar/service/plugindata/handler/WaterfallPluginFileHandler.java
+++ b/src/main/java/io/papermc/hangar/service/plugindata/handler/WaterfallPluginFileHandler.java
@@ -29,7 +29,7 @@ public class WaterfallPluginFileHandler extends FileTypeHandler {
             return result;
         }
 
-        String version = (String) data.get("version");
+        String version = String.valueOf(data.get("version"));
         if (version != null) {
             result.add(new DataValue.StringDataValue("version", version));
         }
diff --git a/src/main/resources/templates/projects/versions/create.ftlh b/src/main/resources/templates/projects/versions/create.ftlh
index decacba9f..242bfb12d 100644
--- a/src/main/resources/templates/projects/versions/create.ftlh
+++ b/src/main/resources/templates/projects/versions/create.ftlh
@@ -121,7 +121,7 @@
                                         <#if version.dependencies??>
                                             <div class="float-right" id="upload-platform-tags">
                                                 <#list version.dependenciesAsGhostTags as pair>
-                                                    <@projectTag.tagTemplate @helper["io.papermc.hangar.model.viewhelpers.ViewTag"].fromVersionTag(pair.right) pair.left "form-publish" />
+                                                    <@projectTag.tagTemplate @helper["io.papermc.hangar.model.viewhelpers.ViewTag"].fromVersionTag(pair.getRight()) pair.left "form-publish" />
                                                 </#list>
                                             </div>
                                         <#else>
diff --git a/src/main/resources/templates/projects/view.ftlh b/src/main/resources/templates/projects/view.ftlh
index 42a8cee5c..8ffc8c0ef 100644
--- a/src/main/resources/templates/projects/view.ftlh
+++ b/src/main/resources/templates/projects/view.ftlh
@@ -16,7 +16,7 @@ Base template for Project overview.
         <script <#-- @CSPNonce.attr -->>
           window.PROJECT_OWNER = "${p.project.ownerName}";
           window.PROJECT_SLUG = "${p.project.slug}";
-          window.PROJECT_ID = "${p.project.pluginId}";
+          window.NAMESPACE = "${p.project.ownerName}/${p.project.slug}";
           window.ALREADY_STARRED = ${sp.starred?c};
 
           window.ACTIVE_NAV = "${active}";