Commit 67c6954c authored by Kostas Papadimitriou's avatar Kostas Papadimitriou
Browse files

Change grouped public network name setting

UI_GROUPED_NETWORK_NAME -> UI_GROUPED_PUBLIC_NETWORK_NAME
parent a21379e7
......@@ -153,7 +153,7 @@ UI_NETWORK_STRICT_DESTROY = True
UI_GROUP_PUBLIC_NETWORKS = True
# The name of the grouped network view
UI_GROUPED_NETWORK_NAME = 'Internet'
UI_GROUPED_PUBLIC_NETWORK_NAME = 'Internet'
###############
......
......@@ -1132,7 +1132,7 @@
},
get_name: function() {
return synnefo.config.grouped_network_name || views.GroupedPublicNetworkView.__super__.get_name.call(this);
return synnefo.config.grouped_public_network_name || views.GroupedPublicNetworkView.__super__.get_name.call(this);
},
nic_in_network: function(nic) {
......
......@@ -627,7 +627,7 @@
synnefo.config.network_strict_destroy = {{ network_strict_destroy }};
synnefo.config.network_allow_multiple_destory = {{ network_allow_multiple_destroy }};
synnefo.config.group_public_networks = {{ group_public_networks }};
synnefo.config.grouped_network_name = {{ grouped_network_name|safe }};
synnefo.config.grouped_public_network_name = {{ grouped_public_network_name|safe }};
synnefo.auth_client = new synnefo.auth.AstakosClient({
login_url: synnefo.config.login_redirect,
......
......@@ -137,7 +137,7 @@ NETWORK_STRICT_DESTROY = getattr(settings,
NETWORK_ALLOW_MULTIPLE_DESTROY = getattr(settings,
'UI_NETWORK_ALLOW_MULTIPLE_DESTROY', False)
GROUP_PUBLIC_NETWORKS = getattr(settings, 'UI_GROUP_PUBLIC_NETWORKS', True)
GROUPED_NETWORK_NAME = getattr(settings, 'UI_GROUPED_NETWORK_NAME', 'Internet')
GROUPED_PUBLIC_NETWORK_NAME = getattr(settings, 'UI_GROUPED_PUBLIC_NETWORK_NAME', 'Internet')
def template(name, request, context):
template_path = os.path.join(os.path.dirname(__file__), "templates/")
......@@ -197,7 +197,7 @@ def home(request):
'network_allow_duplicate_vm_nics': json.dumps(NETWORK_DUPLICATE_NICS),
'network_strict_destroy': json.dumps(NETWORK_STRICT_DESTROY),
'network_allow_multiple_destroy': json.dumps(NETWORK_ALLOW_MULTIPLE_DESTROY),
'grouped_network_name': json.dumps(GROUPED_NETWORK_NAME),
'grouped_public_network_name': json.dumps(GROUPED_PUBLIC_NETWORK_NAME),
'group_public_networks': json.dumps(GROUP_PUBLIC_NETWORKS),
'diagnostics_update_interval': json.dumps(DIAGNOSTICS_UPDATE_INTERVAL)
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment