From 2bdd78edafb3a653177a67776daadb24edfef7fe Mon Sep 17 00:00:00 2001 From: ulrich Date: Thu, 08 Apr 2021 20:17:51 +0000 Subject: [PATCH] Klasse Titel geandert --- src/de/uhilger/mediaz/entity/Titel.java | 9 +++++++++ www/ui/js/app.js | 7 ++++--- www/ui/data/tpl/titel_liste.tpl | 7 +------ 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/de/uhilger/mediaz/entity/Titel.java b/src/de/uhilger/mediaz/entity/Titel.java index 51fb606..301a42a 100644 --- a/src/de/uhilger/mediaz/entity/Titel.java +++ b/src/de/uhilger/mediaz/entity/Titel.java @@ -23,6 +23,7 @@ */ public class Titel { private String katalogUrl; + private String pfad; private String name; public String getKatalogUrl() { @@ -40,5 +41,13 @@ public void setName(String titel) { this.name = titel; } + + public String getPfad() { + return pfad; + } + + public void setPfad(String pfad) { + this.pfad = pfad; + } } diff --git a/www/ui/data/tpl/titel_liste.tpl b/www/ui/data/tpl/titel_liste.tpl index d05e0cb..d0cc049 100644 --- a/www/ui/data/tpl/titel_liste.tpl +++ b/www/ui/data/tpl/titel_liste.tpl @@ -1,8 +1,3 @@ - -<!-- -{"Abspielliste": {"name":"spontan","titel":[{"katalogUrl":"/media/mc","name":"/A/ACDC/Highway-To-Hell02-Girls-got-rhythm.mp3"},{"katalogUrl":"/media/mc","name":"/A/ACDC/Highway-To-Hell07-Get-it-hot.mp3"},{"katalogUrl":"/media/mc","name":"/A/Aerosmith/Big-Ones12-Crazy.mp3"}]}} ---> - {{#Abspielliste}} <div class='entity-formular'> <div class='entity-liste-kopf'> @@ -11,7 +6,7 @@ </div> <ul class='entity-liste'> {{#titel}} - <li class='entity-eintrag'>{{katalogUrl}}{{name}}</li> + <li class='entity-eintrag'>{{name}}</li> {{/titel}} </ul> </div> diff --git a/www/ui/js/app.js b/www/ui/js/app.js index a28d20b..5507333 100644 --- a/www/ui/js/app.js +++ b/www/ui/js/app.js @@ -176,9 +176,9 @@ var titelName = document.querySelector(".selected").textContent; var titel; if(self.mediaPfad.endsWith('/')) { - titel = new Titel(self.mediaPfad + titelName, self.ortPfad); + titel = new Titel(titelName, self.mediaPfad, self.ortPfad); } else { - titel = new Titel(self.mediaPfad + '/' + titelName, self.ortPfad); + titel = new Titel(titelName, self.mediaPfad + '/', self.ortPfad); } var plname = document.querySelector('#playlist').value; self.http_put('../api/alist/' + plname, JSON.stringify(titel), function(responseText) { @@ -707,7 +707,8 @@ this.name = n; } -function Titel(n, u) { +function Titel(n, p, u) { this.katalogUrl = u; + this.pfad = p; this.name = n; } \ No newline at end of file -- Gitblit v1.9.3