rest API migration (WIP) + fixes.
This commit is contained in:
+1
-1
@@ -79,7 +79,7 @@ public class PlaylistController {
|
|||||||
map.put("editAllowed", username.equals(playlist.getUsername()) || securityService.isAdmin(username));
|
map.put("editAllowed", username.equals(playlist.getUsername()) || securityService.isAdmin(username));
|
||||||
map.put("partyMode", userSettings.isPartyModeEnabled());
|
map.put("partyMode", userSettings.isPartyModeEnabled());
|
||||||
|
|
||||||
return new ModelAndView("playList","model",map);
|
return new ModelAndView("playlist","model",map);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -47,7 +47,7 @@ public class PodcastReceiverAdminController {
|
|||||||
@Autowired
|
@Autowired
|
||||||
private PodcastService podcastService;
|
private PodcastService podcastService;
|
||||||
|
|
||||||
@RequestMapping(method = RequestMethod.GET)
|
@RequestMapping(method = RequestMethod.POST)
|
||||||
protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpServletResponse response) throws Exception {
|
protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpServletResponse response) throws Exception {
|
||||||
Integer channelId = ServletRequestUtils.getIntParameter(request, "channelId");
|
Integer channelId = ServletRequestUtils.getIntParameter(request, "channelId");
|
||||||
|
|
||||||
|
|||||||
@@ -263,7 +263,7 @@ public class RESTController {
|
|||||||
jaxbWriter.writeResponse(request, response, res);
|
jaxbWriter.writeResponse(request, response, res);
|
||||||
}
|
}
|
||||||
|
|
||||||
@SuppressWarnings("UnusedDeclaration")
|
@RequestMapping(value = "/rest/getSongsByGenre", method = RequestMethod.GET)
|
||||||
public void getSongsByGenre(HttpServletRequest request, HttpServletResponse response) throws Exception {
|
public void getSongsByGenre(HttpServletRequest request, HttpServletResponse response) throws Exception {
|
||||||
request = wrapRequest(request);
|
request = wrapRequest(request);
|
||||||
Player player = playerService.getPlayer(request, response);
|
Player player = playerService.getPlayer(request, response);
|
||||||
@@ -754,7 +754,7 @@ public class RESTController {
|
|||||||
jaxbWriter.writeResponse(request, response, res);
|
jaxbWriter.writeResponse(request, response, res);
|
||||||
}
|
}
|
||||||
|
|
||||||
@SuppressWarnings("UnusedDeclaration")
|
@RequestMapping(value = "/rest/getPlaylists", method = RequestMethod.GET)
|
||||||
public void getPlaylists(HttpServletRequest request, HttpServletResponse response) throws Exception {
|
public void getPlaylists(HttpServletRequest request, HttpServletResponse response) throws Exception {
|
||||||
request = wrapRequest(request);
|
request = wrapRequest(request);
|
||||||
|
|
||||||
@@ -1500,7 +1500,7 @@ public class RESTController {
|
|||||||
jaxbWriter.writeResponse(request, response, res);
|
jaxbWriter.writeResponse(request, response, res);
|
||||||
}
|
}
|
||||||
|
|
||||||
@SuppressWarnings("UnusedDeclaration")
|
@RequestMapping(value = "/rest/getPodcasts", method = RequestMethod.GET)
|
||||||
public void getPodcasts(HttpServletRequest request, HttpServletResponse response) throws Exception {
|
public void getPodcasts(HttpServletRequest request, HttpServletResponse response) throws Exception {
|
||||||
request = wrapRequest(request);
|
request = wrapRequest(request);
|
||||||
Player player = playerService.getPlayer(request, response);
|
Player player = playerService.getPlayer(request, response);
|
||||||
|
|||||||
@@ -99,7 +99,7 @@
|
|||||||
</tr></table>
|
</tr></table>
|
||||||
|
|
||||||
<c:if test="${model.user.podcastRole}">
|
<c:if test="${model.user.podcastRole}">
|
||||||
<form method="post" action="podcastReceiverAdmin.view?">
|
<form:form method="post" action="podcastReceiverAdmin.view?">
|
||||||
<table>
|
<table>
|
||||||
<tr>
|
<tr>
|
||||||
<td><fmt:message key="podcastreceiver.subscribe"/></td>
|
<td><fmt:message key="podcastreceiver.subscribe"/></td>
|
||||||
@@ -107,7 +107,7 @@
|
|||||||
<td><input type="submit" value="<fmt:message key="common.ok"/>"/></td>
|
<td><input type="submit" value="<fmt:message key="common.ok"/>"/></td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
</form>
|
</form:form>
|
||||||
</c:if>
|
</c:if>
|
||||||
|
|
||||||
</body>
|
</body>
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user