From 0eb4f67a484bf7ff2aeb090e7941cd8436090051 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emanuel=20Sch=C3=BCtze?= <emanuel@intevation.de>
Date: Sun, 15 Jan 2017 12:13:46 +0100
Subject: [PATCH] Use always '/' at the end of projector url.

e.g. '/projector/1/' or '/real-projetor/1/'
---
 openslides/core/static/js/core/site.js                        | 4 ++--
 openslides/core/static/templates/core/manage-projectors.html  | 2 +-
 openslides/core/static/templates/core/projector-controls.html | 2 +-
 openslides/core/static/templates/projector-container.html     | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/openslides/core/static/js/core/site.js b/openslides/core/static/js/core/site.js
index 780c43e6a..af7f1e175 100644
--- a/openslides/core/static/js/core/site.js
+++ b/openslides/core/static/js/core/site.js
@@ -266,7 +266,7 @@ angular.module('OpenSlidesApp.core.site', [
                 },
             })
             .state('projector', {
-                url: '/projector/{id:int}',
+                url: '/projector/{id:int}/',
                 templateUrl: 'static/templates/projector-container.html',
                 data: {extern: true},
                 onEnter: function($window) {
@@ -274,7 +274,7 @@ angular.module('OpenSlidesApp.core.site', [
                 }
             })
             .state('real-projector', {
-                url: '/real-projector/{id:int}',
+                url: '/real-projector/{id:int}/',
                 templateUrl: 'static/templates/projector.html',
                 data: {extern: true},
                 onEnter: function($window) {
diff --git a/openslides/core/static/templates/core/manage-projectors.html b/openslides/core/static/templates/core/manage-projectors.html
index 1ce4b70f7..b4c40441c 100644
--- a/openslides/core/static/templates/core/manage-projectors.html
+++ b/openslides/core/static/templates/core/manage-projectors.html
@@ -125,7 +125,7 @@
 
       <a ui-sref="projector({id: projector.id})" target="_blank">
         <div class="iframewrapper" id="iframewrapper_{{ projector.id }}">
-          <iframe class="iframe" id="iframe_{{ projector.id }}" ng-src="{{ '/real-projector/' + projector.id }}" frameborder="0"></iframe>
+          <iframe class="iframe" id="iframe_{{ projector.id }}" ng-src="{{ '/real-projector/' + projector.id + '/' }}" frameborder="0"></iframe>
           <div class="iframeoverlay" id="iframeoverlay_{{ projector.id }}"></div>
         </div>
       </a>
diff --git a/openslides/core/static/templates/core/projector-controls.html b/openslides/core/static/templates/core/projector-controls.html
index 8d71dd305..e971f30ca 100644
--- a/openslides/core/static/templates/core/projector-controls.html
+++ b/openslides/core/static/templates/core/projector-controls.html
@@ -78,7 +78,7 @@
 
         <a ui-sref="projector({id: active_projector.id })" target="_blank">
           <div class="iframewrapper" id="iframewrapper_sidebar">
-            <iframe class="iframe" id="iframe_sidebar" ng-src="{{ '/real-projector/' + active_projector.id }}" frameborder="0"></iframe>
+            <iframe class="iframe" id="iframe_sidebar" ng-src="{{ '/real-projector/' + active_projector.id + '/'}}" frameborder="0"></iframe>
             <div class="iframeoverlay" id="iframeoverlay_sidebar"></div>
           </div>
         </a>
diff --git a/openslides/core/static/templates/projector-container.html b/openslides/core/static/templates/projector-container.html
index 091b766a6..50c274b19 100644
--- a/openslides/core/static/templates/projector-container.html
+++ b/openslides/core/static/templates/projector-container.html
@@ -39,7 +39,7 @@
     </style>
 
     <div id="iframewrapper" ng-hide="error">
-      <iframe id="iframe" ng-src="{{ '/real-projector/' + projectorId }}" frameborder="0"></iframe>
+      <iframe id="iframe" ng-src="{{ '/real-projector/' + projectorId + '/'}}" frameborder="0"></iframe>
       <div id="iframeoverlay"></div>
     </div>