localhorst/e-commerce
Archived
4
1
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

fix/intern_articles #39

Merged
Seil0 merged 5 commits from fix/intern_articles into master 2020-05-28 13:23:02 +02:00
Conversation 3 Commits 5 Files Changed 4 +9 -9
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 08dc4bcb47 - Show all commits

4
prototype/src/main/java/org/hso/ecommerce/controller/intern/InternArticleController.java
View File

@ -83,7 +83,7 @@ public class InternArticleController {
@RequestParam(value = "price_netto", required = true) String pricenetto,
@RequestParam(value = "reorderMaxPrice", required = true) String reorderMaxPrice,
@RequestParam(value = "autobuy", required = true) Boolean shouldReorder,
@RequestParam(value = "categories", required = true) String categories,
@RequestParam(value = "categorie", required = true) String categories,
@RequestParam(value = "img", required = true) MultipartFile imgFile) {
Article tmpArticle = articleRepository.findArticleById(id); // get the old article
@ -93,7 +93,7 @@ public class InternArticleController {
tmpArticle.categories.clear();
// loop through all categories strings and create a new category if a new one;
// also adds the categorys to the article
// also adds the categories to the article
for (String category : separatedCategories) {
tmpArticle.categories.add(categoryRepository.findCategoryByName(category.trim())
.orElseGet(() -> new Category(category.trim())));

6
prototype/src/main/resources/templates/intern/listedArticles/id.html
View File

@ -70,9 +70,9 @@
<p>
Bitte jede Kategorien in eine eigene Zeile
</p>
<textarea name="categories" id="categories" class="full-width" rows="6"th:inline="text">[[${ArticleID.categorie}]]
<textarea name="categorie" id="categorie" class="full-width" required rows="6"th:inline="text" th:field="${ArticleID.categorie}">
</textarea>
</textarea>
</div>
<div class="s">
<p>
@ -93,7 +93,7 @@
</div>
<p class="l">
<label for="description">Beschreibung</label>
<textarea name="description" id="description" class="full-width" rows="15" th:inline="text">[[${ArticleID.description}]]
<textarea name="description" id="description" class="full-width" required th:field="${ArticleID.description}" rows="15" th:inline="text">
</textarea>
</p>
<div class="l">