From 157c8d6730158e1d2c996fd8e90501ab1ab8c08d Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Fri, 1 Feb 2019 14:02:01 -0500
Subject: #775 make sure we don't play invalid eids and also move Event Montage
 up again where it was in the menu

---
 www/js/MontageHistoryCtrl.js |  2 +-
 www/templates/menu.html      | 15 +++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

(limited to 'www')

diff --git a/www/js/MontageHistoryCtrl.js b/www/js/MontageHistoryCtrl.js
index 9168ade3..497b1973 100644
--- a/www/js/MontageHistoryCtrl.js
+++ b/www/js/MontageHistoryCtrl.js
@@ -869,7 +869,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
     .then (function (success) {
       NVR.debug ("next event for monitor:"+m.Monitor.Id+" is "+success.eid);
 
-      if (success.eid != "null" && success.eid != m.Monitor.eid) {
+      if (success.eid != "null" && success.eid != m.Monitor.eid && success.eid !="-1") {
        
         var videoURL= m.Monitor.baseURL  + "/index.php?view=view_video&eid=" + success.eid;
 
diff --git a/www/templates/menu.html b/www/templates/menu.html
index 42871af7..ba8b78fa 100644
--- a/www/templates/menu.html
+++ b/www/templates/menu.html
@@ -33,6 +33,7 @@
             </span>{{'kMenuMontage'|translate}}
           </ion-item>
 
+            
           <!--<ion-item ng-click="navigateView('app.timeline')" menu-close>-->
           <ion-item id="menu-move-2" href="#/app/timeline" ng-click="go('/app/timeline')">
             <span class=" item-icon-left">
@@ -47,6 +48,14 @@
             </span>{{'kMenuEvents'|translate}}
           </ion-item>
 
+          <!-- <ion-item  ng-click="navigateView('app.montage-history')" menu-close>-->
+              <ion-item id="menu-move-5" href="#/app/montage-history" ng-click="go('/app/montage-history')">
+                <span class=" item-icon-left">
+                  <i class="icon ion-ios-keypad-outline"></i>
+                </span>{{'kMenuEventMontage'|translate}}
+              </ion-item>
+              
+              
           <!--<ion-item  ng-click="navigateView('app.moment')" menu-close>-->
           <ion-item id="menu-move-4" ng-click="go('/app/moment')" href="#/app/moment" ng-click="go('/app/moment')">
             <span class=" item-icon-left">
@@ -91,12 +100,6 @@
             </span> {{'kMenuDevSettings'|translate}}
           </ion-item>
 
-          <!-- <ion-item  ng-click="navigateView('app.montage-history')" menu-close>-->
-            <ion-item id="menu-move-5" href="#/app/montage-history" ng-click="go('/app/montage-history')">
-              <span class=" item-icon-left">
-                <i class="icon ion-ios-keypad-outline"></i>
-              </span>{{'kMenuEventMontage'|translate}}
-            </ion-item>
             
           <ion-item ng-click="switchLang()" nav-clear menu-close>
             <span class=" item-icon-left">
-- 
cgit v1.2.3