x/tuskar-ui
Code Issues Proposed changes

making suggested fixes from termie

Browse Source
This commit is contained in:
Jake Dahn
2011-06-17 19:23:44 -07:00
parent f1d6703ce0
commit f94eae2ca5
3 changed files with 20 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
django-openstack/src/django_openstack/syspanel/views/services.py
View File

@@ -21,10 +21,8 @@ from django_openstack import forms
from django_openstack.dash.views import instances as dash_instances from django_openstack.dash.views import instances as dash_instances
from openstackx.api import exceptions as api_exceptions from openstackx.api import exceptions as api_exceptions
LOG = logging.getLogger('django_openstack.nova')
class ToggleService(forms.SelfHandlingForm):
class ServiceToggleEnabledForm(forms.SelfHandlingForm):
service = forms.CharField(required=False) service = forms.CharField(required=False)
name = forms.CharField(required=False) name = forms.CharField(required=False)
@@ -34,13 +32,13 @@ class ServiceToggleEnabledForm(forms.SelfHandlingForm):
api.admin_api(request).services.update(data['service'], api.admin_api(request).services.update(data['service'],
not service.disabled) not service.disabled)
if service.disabled: if service.disabled:
messages.info(request, "Service '%s' has been enabled" \ messages.info(request, "Service '%s' has been enabled"
% data['name']) % data['name'])
else: else:
messages.info(request, "Service '%s' has been disabled" \ messages.info(request, "Service '%s' has been disabled"
% data['name']) % data['name'])
except api_exceptions.ApiException, e: except api_exceptions.ApiException, e:
messages.error(request, "Unable to update service '%s': %s" \ messages.error(request, "Unable to update service '%s': %s"
% data['name'], e.message) % data['name'], e.message)
return redirect(request.build_absolute_uri()) return redirect(request.build_absolute_uri())
@@ -48,7 +46,7 @@ class ServiceToggleEnabledForm(forms.SelfHandlingForm):
@login_required @login_required
def index(request): def index(request):
for f in (ServiceToggleEnabledForm,): for f in (ToggleService,):
_, handled = f.maybe_handle(request) _, handled = f.maybe_handle(request)
if handled: if handled:
return handled return handled
@@ -69,12 +67,12 @@ def index(request):
except: except:
up = False up = False
hostname = urlparse.urlparse(v['internalURL']).hostname hostname = urlparse.urlparse(v['internalURL']).hostname
row = { 'type': k, 'internalURL': v['internalURL'], 'host': hostname, row = {'type': k, 'internalURL': v['internalURL'], 'host': hostname,
'region': v['region'], 'up': up } 'region': v['region'], 'up': up }
other_services.append(row) other_services.append(row)
return render_to_response('syspanel_services.html', { return render_to_response('syspanel_services.html', {
'services': services, 'services': services,
'service_toggle_enabled_form': ServiceToggleEnabledForm, 'service_toggle_enabled_form': ToggleService,
'other_services': other_services, 'other_services': other_services,
}, context_instance = template.RequestContext(request)) }, context_instance = template.RequestContext(request))

28
openstack-dashboard/dashboard/templates/_syspanel_service_list.html
View File

@@ -8,17 +8,11 @@
</tr> </tr>
{% for service in services %} {% for service in services %}
<tr class="{% if service.up %}good{% endif %} {% if service.disabled %}medium{% endif %}{% if not service.up %}bad{% endif %} {% cycle 'odd' 'even' %}"> <tr class='{{service.up|yesno:"good,bad"}} {{service.disabled|yesno:"medium,"}} {% cycle 'odd' 'even' %}'>
<td> {{service.host}} </td> <td>{{service.host}}</td>
<td> {{service.type}} </td> <td>{{service.type}}</td>
<td> <td>{{service.disabled|yesno:"Enabled,Disabled"}}</td>
{% if service.disabled %} <td>{{service.up}}</td>
Disabled
{% else %}
Enabled
{% endif %}
</td>
<td> {{service.up}} </td>
<td id="actions"> <td id="actions">
<ul> <ul>
<li>{% include "_service_toggle_enabled.html" with form=service_toggle_enabled_form %}</li> <li>{% include "_service_toggle_enabled.html" with form=service_toggle_enabled_form %}</li>
@@ -27,12 +21,12 @@
</tr> </tr>
{% endfor %} {% endfor %}
{% for service in other_services %} {% for service in other_services %}
<tr class="{% if service.up %}good{% endif %} {% if service.disabled %}medium{% endif %}{% if not service.up %}bad{% endif %} {% cycle 'odd' 'even' %}"> <tr class='{{service.up|yesno:"good,bad"}} {{service.disabled|yesno:"medium,"}} {% cycle 'odd' 'even' %}'>
<td> {{service.host}} </td> <td>{{service.host}}</td>
<td> {{service.type}} </td> <td>{{service.type}}</td>
<td> Enabled </td> <td>{{service.disabled|yesno:"Enabled,Disabled"}}</td>
<td> {{service.up}} </td> <td>{{service.up}}</td>
<td> </td> <td></td>
</tr> </tr>
{% endfor %} {% endfor %}
</table> </table>

2
openstack-dashboard/dashboard/templates/syspanel_services.html
View File

@@ -11,7 +11,7 @@
{% block main %} {% block main %}
<div id='page_header'> <div id='page_header'>
<h2><span>System Panel:</span> Services</h2> <h2><span>System Panel:</span> Services</h2>
<p class='desc'><span>&mdash;</span> Create, Edit, Upload, and Delete Services.</p> <p class='desc'><span>&mdash;</span>View Service statuses, and toggle them to enabled or disabled.</p>
</div> </div>
{% include "_messages.html" %} {% include "_messages.html" %}
<div class="main_content"> <div class="main_content">