diff --git a/Bamboo/Controller.cs b/Bamboo/Controller.cs index 908c0b7..19057d1 100644 --- a/Bamboo/Controller.cs +++ b/Bamboo/Controller.cs @@ -94,10 +94,11 @@ namespace Bamboo.Controllers index++; } + episode_tpl.Append(voice_tpl); if (rjson) - return Content(episode_tpl.ToJson(voice_tpl), "application/json; charset=utf-8"); + return Content(episode_tpl.ToJson(), "application/json; charset=utf-8"); - return Content(voice_tpl.ToHtml() + episode_tpl.ToHtml(), "text/html; charset=utf-8"); + return Content(episode_tpl.ToHtml(), "text/html; charset=utf-8"); } else { diff --git a/UAKino/Controller.cs b/UAKino/Controller.cs index 84253b1..71d1b3e 100644 --- a/UAKino/Controller.cs +++ b/UAKino/Controller.cs @@ -94,10 +94,11 @@ namespace UAKino.Controllers index++; } + episode_tpl.Append(voice_tpl); if (rjson) - return Content(episode_tpl.ToJson(voice_tpl), "application/json; charset=utf-8"); + return Content(episode_tpl.ToJson(), "application/json; charset=utf-8"); - return Content(voice_tpl.ToHtml() + episode_tpl.ToHtml(), "text/html; charset=utf-8"); + return Content(episode_tpl.ToHtml(), "text/html; charset=utf-8"); } else { diff --git a/UaTUT/Controller.cs b/UaTUT/Controller.cs index 80494f1..f2e35fd 100644 --- a/UaTUT/Controller.cs +++ b/UaTUT/Controller.cs @@ -204,10 +204,11 @@ namespace UaTUT OnLog($"UaTUT: generated {voiceCount} voices, {episodeCount} episodes"); + episode_tpl.Append(voice_tpl); if (rjson) - return Content(episode_tpl.ToJson(voice_tpl), "application/json; charset=utf-8"); + return Content(episode_tpl.ToJson(), "application/json; charset=utf-8"); - return Content(voice_tpl.ToHtml() + episode_tpl.ToHtml(), "text/html; charset=utf-8"); + return Content(episode_tpl.ToHtml(), "text/html; charset=utf-8"); } } diff --git a/Uaflix/Controller.cs b/Uaflix/Controller.cs index 07e3fe6..9676d63 100644 --- a/Uaflix/Controller.cs +++ b/Uaflix/Controller.cs @@ -306,15 +306,16 @@ namespace Uaflix.Controllers OnLog($"Created EpisodeTpl with {episodes.Count} episodes"); // Повертаємо VoiceTpl + EpisodeTpl разом + episode_tpl.Append(voice_tpl); if (rjson) { OnLog($"=== RETURN: episode template with voices JSON ({episodes.Count} episodes) ==="); - return Content(episode_tpl.ToJson(voice_tpl), "application/json; charset=utf-8"); + return Content(episode_tpl.ToJson(), "application/json; charset=utf-8"); } else { OnLog($"=== RETURN: voice + episode template HTML ({episodes.Count} episodes) ==="); - return Content(voice_tpl.ToHtml() + episode_tpl.ToHtml(), "text/html; charset=utf-8"); + return Content(episode_tpl.ToHtml(), "text/html; charset=utf-8"); } }