jafea7
/
ctbrec-5.3.2-experimental
mirror of https://github.com/Jafea7/ctbrec-5.3.2-original.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into manyvids

This commit is contained in:
0xb00bface 2020-08-17 14:03:21 +02:00
parent 36885900b5 1aa3ccdedf
commit d0f1834bda
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -1,3 +1,8 @@
3.8.7
========================
* Fixed bug in recorder servlet. Actions for unpin and notes were mixed up
*
3.8.6 3.8.6
======================== ========================
* Added setting to disable the online check for paused models * Added setting to disable the online check for paused models

4
server/src/main/java/ctbrec/recorder/server/RecorderServlet.java
View File

@ -163,14 +163,14 @@ public class RecorderServlet extends AbstractCtbrecServlet {
resp.getWriter().write("]}"); resp.getWriter().write("]}");
break; break;
case "unpin": case "unpin":
recorder.setNote(request.recording, request.recording.getNote()); recorder.unpin(request.recording);
recAdapter = moshi.adapter(Recording.class); recAdapter = moshi.adapter(Recording.class);
resp.getWriter().write("{\"status\": \"success\", \"msg\": \"Note saved\", \"recordings\": ["); resp.getWriter().write("{\"status\": \"success\", \"msg\": \"Note saved\", \"recordings\": [");
resp.getWriter().write(recAdapter.toJson(request.recording)); resp.getWriter().write(recAdapter.toJson(request.recording));
resp.getWriter().write("]}"); resp.getWriter().write("]}");
break; break;
case "setNote": case "setNote":
recorder.unpin(request.recording); recorder.setNote(request.recording, request.recording.getNote());
recAdapter = moshi.adapter(Recording.class); recAdapter = moshi.adapter(Recording.class);
resp.getWriter().write("{\"status\": \"success\", \"msg\": \"List of recordings\", \"recordings\": ["); resp.getWriter().write("{\"status\": \"success\", \"msg\": \"List of recordings\", \"recordings\": [");
resp.getWriter().write(recAdapter.toJson(request.recording)); resp.getWriter().write(recAdapter.toJson(request.recording));