Merge pull request #2610 from coreos-inc/tag-expiraiton
Always show the tag expiration options UI in the superuser panel
This commit is contained in:
commit
e5ec33511f
1 changed files with 9 additions and 6 deletions
|
@ -202,6 +202,15 @@
|
||||||
</div>
|
</div>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td>Allowed expiration periods:</td>
|
||||||
|
<td>
|
||||||
|
<span class="config-list-field" item-title="Tag Expiration Period" binding="config.TAG_EXPIRATION_OPTIONS" item-pattern="[0-9]+(m|w|h|d|s)"></span>
|
||||||
|
<div class="help-text">
|
||||||
|
The expiration periods allowed for configuration. The default tag expiration *must* be in this list.
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td>Allow users to select expiration:</td>
|
<td>Allow users to select expiration:</td>
|
||||||
<td>
|
<td>
|
||||||
|
@ -214,12 +223,6 @@
|
||||||
</div>
|
</div>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr ng-if="config.FEATURE_CHANGE_TAG_EXPIRATION">
|
|
||||||
<td>Selectable expiration periods:</td>
|
|
||||||
<td>
|
|
||||||
<span class="config-list-field" item-title="Tag Expiration Period" binding="config.TAG_EXPIRATION_OPTIONS" item-pattern="[0-9]+(m|w|h|d|s)"></span>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
</div> <!-- /Time Machine -->
|
</div> <!-- /Time Machine -->
|
||||||
|
|
Reference in a new issue