StephanRichter/Widerhall
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Activity

Merge branch 'main' into lang_de

Browse Source
This commit is contained in:
Stephan Richter
2022-04-22 14:11:32 +02:00
parent 578a748b68 c841a8f873
commit f0b54ea48f
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/de/srsoftware/widerhall/web/Web.java
View File

@@ -135,9 +135,8 @@ public class Web extends TemplateServlet {
} }
private String archive(HttpServletRequest req, HttpServletResponse resp) { private String archive(HttpServletRequest req, HttpServletResponse resp) {
var domain = req.getParameter(DOMAIN); var list = Util.getMailingList(req);
var prefix = req.getParameter(PREFIX); return loadTemplate(ARCHIVE,Map.of(LIST,list.email()),resp);
return loadTemplate(ARCHIVE,Map.of(DOMAIN,domain,PREFIX,prefix),resp);
} }
private String confirm(HttpServletRequest req, HttpServletResponse resp) { private String confirm(HttpServletRequest req, HttpServletResponse resp) {

2
static/templates/archive.st
View File

@@ -21,6 +21,6 @@
«footer()» «footer()»
</body> </body>
<script type="text/javascript"> <script type="text/javascript">
loadArchive('«data.domain»','«data.prefix»'); loadArchive('«data.list»');
</script> </script>
</html> </html>

3
static/templates/js.st
View File

@@ -40,8 +40,7 @@ function hideList(listEmail){
$.post('/api/list/hide',{list:listEmail},showListResult,'json'); $.post('/api/list/hide',{list:listEmail},showListResult,'json');
} }
function loadArchive(domain,prefix){ function loadArchive(listEmail){
let listEmail = prefix+'@'+domain;
$.get('/api/list/archive?list='+listEmail,showListArchive,'json'); $.get('/api/list/archive?list='+listEmail,showListArchive,'json');
} }