bug #1936: Use symbols instead of strings when using session parameters

This commit is contained in:
Daniel Molina committed 2013-04-22 17:51:31 +02:00
1 parent abd2cf12b6
commit e2c51659d0
2 files changed
+6 -6

No files matched your search

+1 -1
View File
@@ -187,7 +187,7 @@ helpers do
if user['TEMPLATE/DEFAULT_VIEW']
session[:default_view] = user['TEMPLATE/DEFAULT_VIEW']
else
session[:default_view] = $views_config.available_views(session['user'], session['user_gname']).first
session[:default_view] = $views_config.available_views(session[:user], session[:user_gname]).first
end
#end user options
+5 -5
View File
@@ -38,19 +38,19 @@
<script src="js/sunstone.js" type="text/javascript"></script>
<script src="js/sunstone-util.js" type="text/javascript"></script>
<script src="js/monitoring.js" type="text/javascript"></script>
<% view = $views_config.view(session['user'], session['user_gname'], session['default_view']) %>
<% view = $views_config.view(session[:user], session[:user_gname], session[:default_view]) %>
<script>
var view = JSON.parse('<%= view.to_json %>')
var available_views = JSON.parse('["<%=
$views_config.available_views(session['user'], session['user_gname']).join('","')
$views_config.available_views(session[:user], session[:user_gname]).join('","')
%>"]')
config = {
'user_config' : {
'lang' : '<%= session['lang'] %>',
'vnc_wss' : '<%= session['vnc_wss'] %>',
'default_view' : '<%= session['default_view'] %>'
'lang' : '<%= session[:lang] %>',
'vnc_wss' : '<%= session[:vnc_wss] %>',
'default_view' : '<%= session[:default_view] %>'
},
'system_config' : {
'marketplace_url' : '<%= $conf[:marketplace_url] %>',