Changeset 25818

Timestamp:

Dec 7, 2013, 8:40:29 PM (10 years ago)

Author:

mistic100

Message:

better control over session cache for multiview data

Location:

extensions/AdminTools

Files:

• include/MultiView.class.php (modified) (2 diffs)
• include/events.inc.php (modified) (1 diff)
• main.inc.php (modified) (1 diff)
• template/public_controller.js (modified) (1 diff)
• template/public_controller.tpl (modified) (2 diffs)

extensions/AdminTools/include/MultiView.class.php

@@ -214 +214 @@
   
   /**
+   * Mark browser session cache for deletion
+   */
+  public static function invalidate_cache()
+  {
+    global $conf;
+    conf_update_param('multiview_invalidate_cache', true);
+    $conf['multiview_invalidate_cache'] = true;
+  }
+  
+  /**
    * Register custom API methods
    */
@@ -268 +278 @@
     }
     
+    conf_delete_param('multiview_invalidate_cache');
+    
     return $out;
   }

extensions/AdminTools/include/events.inc.php

@@ -24 +24 @@
     'CURRENT_USERNAME' => $user['id']==$conf['guest_id'] ? l10n('guest') : $user['username'],
     'PWG_TOKEN' =>        get_pwg_token(),
+    'DELETE_CACHE' =>     isset($conf['multiview_invalidate_cache']),
     );
 

extensions/AdminTools/main.inc.php

@@ -36 +36 @@
 
 add_event_handler('ws_add_methods', array('MultiView', 'register_ws'));
+add_event_handler('delete_user', array('MultiView', 'invalidate_cache'));
+add_event_handler('register_user', array('MultiView', 'invalidate_cache'));
 
 

extensions/AdminTools/template/public_controller.js

@@ -80 +80 @@
   }
 
+  // delete session cache
+  this.deleteCache = function() {
+    if ('sessionStorage' in window) {
+      window.sessionStorage.removeItem('multiView');
+    }
+  };
+
   // move close button to smartpocket toolbar
   this.initMobile = function() {

extensions/AdminTools/template/public_controller.tpl

@@ -34 +34 @@
 AdminTools.urlWS = '{$ROOT_URL}ws.php?format=json&method=';
 AdminTools.multiView = {
-  'view_as': "{$ato.MULTIVIEW.view_as}",
-  'theme': "{$ato.MULTIVIEW.theme}",
-  'lang': "{$ato.MULTIVIEW.lang}"
+  view_as: {$ato.MULTIVIEW.view_as},
+  theme: '{$ato.MULTIVIEW.theme}',
+  lang: '{$ato.MULTIVIEW.lang}'
 };
 
-AdminTools.init();
+{if $ato.DELETE_CACHE}
+  AdminTools.deleteCache();
+{/if}
+  AdminTools.init();
 {if $themeconf.mobile}
   AdminTools.initMobile();
@@ -51 +54 @@
 {if isset($ato.QUICK_EDIT)}
   AdminTools.initQuickEdit({intval(isset($ato.IS_PICTURE))}, {
-    hintText: '{'Type in a search term'|@translate}',
-    noResultsText: '{'No results'|@translate}',
-    searchingText: '{'Searching...'|@translate}',
-    newText: ' ({'new'|@translate})'
+    hintText: '{'Type in a search term'|translate|escape:javascript}',
+    noResultsText: '{'No results'|translate|escape:javascript}',
+    searchingText: '{'Searching...'|translate|escape:javascript}',
+    newText: ' ({'new'|translate|escape:javascript})'
   });
 {/if}