Undoing earlier changes, they didn't work out as expected

grtjn · May 21, 2015 · f9d1dbe · f9d1dbe
1 parent 42c8bbe
commit f9d1dbe
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 8 deletions.
diff --git a/deploy/ml-config.xml b/deploy/ml-config.xml
@@ -745,7 +745,7 @@
       <external-security-name>marklogic-ldap</external-security-name>
       <description>Authentication against MarkLogic LDAP</description>
       <authentication>ldap</authentication>
-      <cache-timeout>300</cache-timeout>
+      <cache-timeout>999999999</cache-timeout>
       <authorization>ldap</authorization>
       <ldap-server-uri>ldap://ldap.marklogic.com:3268</ldap-server-uri>
       <ldap-base>OU=Employees,OU=CORP,DC=marklogic,DC=com</ldap-base>

diff --git a/server.js b/server.js
@@ -50,6 +50,7 @@ exports.buildExpress = function(options) {
   }
 
   function clearLdapCache(req) {
+    /* GJo: not working as expected. Instead we will use unlimited cache timeout..
     var mlReq = http.request({
       hostname: options.mlHost,
       port: options.mlPort,
@@ -63,6 +64,7 @@ exports.buildExpress = function(options) {
     });
     
     mlReq.end();
+    */
   }
 
   function proxy(req, res) {

diff --git a/ui/app/scripts/controllers/demo.js b/ui/app/scripts/controllers/demo.js
@@ -2,12 +2,10 @@
   'use strict';
 
   angular.module('demoCat')
+    .factory('DemoModel', DemoModel)
     .controller('DemoCtrl', DemoCtrl);
 
-  DemoCtrl.$inject = ['$scope', 'MLRest', '$location', '$routeParams', 'demo', 'user', '$modal', '$sce', 'demoService', '$sanitize'];
-
-  function DemoCtrl($scope, mlRest, $location, $routeParams, demo, user, $modal, $sce, demoService, $sanitize) {
-    var uri = $routeParams.uri;
+  function DemoModel() {
     var commentModel = {
       // set by model binding
       msg: '',
@@ -32,7 +30,6 @@
 
     var model = {
       // your model stuff here
-      uri: $routeParams.uri,
       demo: {
         comments: [],
         bugs: []
@@ -60,9 +57,18 @@
         /* jshint camelcase: false */
         toolbar_full: '',
         followError: false
-      },
-      user: user
+      }
     };
+    return model;
+  }
+
+  DemoCtrl.$inject = ['$scope', 'MLRest', '$location', '$routeParams', 'demo', 'user', '$modal', '$sce', 'demoService', '$sanitize', 'DemoModel'];
+
+  function DemoCtrl($scope, mlRest, $location, $routeParams, demo, user, $modal, $sce, demoService, $sanitize, model) {
+    var uri = $routeParams.uri;
+    model.uri = $routeParams.uri;
+    model.user = user;
+
     if (demo) {
       var imageExtensions = ['jpeg','jpg','gif','png'];
       var videoExtensions = ['webm','ogg','mp4'];
@@ -93,6 +99,12 @@
           bug.nr = index + 1;
         }
       });
+    } else {
+      model.demo = {
+        comments: [],
+        bugs: []
+      };
+      model.attachedMedia = [];
     }
 
     angular.extend($scope, {