x/tuskar-ui
Code Issues Proposed changes

fix enabled/disabled logic for services

Browse Source
This commit is contained in:
Anthony Young
2011-06-18 19:22:14 -07:00
parent 9393bf59dd
commit 78a7b801f9
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
openstack-dashboard/dashboard/templates/_service_toggle_enabled.html
View File

@@ -1,14 +1,4 @@
{% if service.enabled %} {% if service.disabled %}
<form id="form_service_disable_{{service.id}}" class="form-service-disable" method="post">
{% csrf_token %}
{% for hidden in form.hidden_fields %}
{{hidden}}
{% endfor %}
<input name="service" type="hidden" value="{{service.id}}" />
<input name="name" type="hidden" value="{{service.type}}" />
<input id="disable_{{service.id}}" class="disable" type="submit" value="Disable" />
</form>
{% else %}
<form id="form_service_enable_{{service.id}}" class="form-service-enable" method="post"> <form id="form_service_enable_{{service.id}}" class="form-service-enable" method="post">
{% csrf_token %} {% csrf_token %}
{% for hidden in form.hidden_fields %} {% for hidden in form.hidden_fields %}
@@ -18,4 +8,14 @@
<input name="name" type="hidden" value="{{service.type}}" /> <input name="name" type="hidden" value="{{service.type}}" />
<input id="enable_{{service.id}}" class="enable" type="submit" value="Enable" /> <input id="enable_{{service.id}}" class="enable" type="submit" value="Enable" />
</form> </form>
{% else %}
<form id="form_service_disable_{{service.id}}" class="form-service-disable" method="post">
{% csrf_token %}
{% for hidden in form.hidden_fields %}
{{hidden}}
{% endfor %}
<input name="service" type="hidden" value="{{service.id}}" />
<input name="name" type="hidden" value="{{service.type}}" />
<input id="disable_{{service.id}}" class="disable" type="submit" value="Disable" />
</form>
{% endif %} {% endif %}

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

@@ -11,7 +11,7 @@
<tr class='{{service.up|yesno:"good,bad"}} {{service.disabled|yesno:"medium,"}} {% 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>{{service.disabled|yesno:"Enabled,Disabled"}}</td> <td>{{service.disabled|yesno:"Disabled,Enabled"}}</td>
<td>{{service.up}}</td> <td>{{service.up}}</td>
<td id="actions"> <td id="actions">
<ul> <ul>
@@ -24,7 +24,7 @@
<tr class='{{service.up|yesno:"good,bad"}} {{service.disabled|yesno:"medium,"}} {% 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>{{service.disabled|yesno:"Enabled,Disabled"}}</td> <td>{{service.disabled|yesno:"Disabled,Enabled"}}</td>
<td>{{service.up}}</td> <td>{{service.up}}</td>
<td></td> <td></td>
</tr> </tr>