fix log in issue

This commit is contained in:
2025-12-28 06:05:27 +01:00
parent a9ad5bc2ad
commit 0c5f801854
2 changed files with 40 additions and 35 deletions

View File

@@ -31,12 +31,15 @@
<span class="badge badge-user">User</span> <span class="badge badge-user">User</span>
{% endif %} {% endif %}
</td> </td>
<td>{{ user.created_at.strftime('%Y-%m-%d %H:%M') }}</td> <td>{{ user.created_at.strftime('%Y-%m-%d %H:%M') if user.created_at else 'N/A' }}</td>
<td> <td>
<button class="btn btn-sm btn-primary" onclick="openResetPasswordModal({{ user.id }}, '{{ user.username }}')">Reset Password</button> <button class="btn btn-sm btn-primary"
onclick="openResetPasswordModal({{ user.id }}, '{{ user.username }}')">Reset Password</button>
{% if user.id != current_user.id %} {% if user.id != current_user.id %}
<form method="POST" action="{{ url_for('admin.delete_user', user_id=user.id) }}" style="display: inline;"> <form method="POST" action="{{ url_for('admin.delete_user', user_id=user.id) }}"
<button type="submit" class="btn btn-sm btn-danger" onclick="return confirm('Delete user {{ user.username }}?')">Delete</button> style="display: inline;">
<button type="submit" class="btn btn-sm btn-danger"
onclick="return confirm('Delete user {{ user.username }}?')">Delete</button>
</form> </form>
{% endif %} {% endif %}
</td> </td>
@@ -92,25 +95,25 @@
</div> </div>
<script> <script>
function openModal(modalId) { function openModal(modalId) {
document.getElementById(modalId).classList.add('active'); document.getElementById(modalId).classList.add('active');
} }
function closeModal(modalId) { function closeModal(modalId) {
document.getElementById(modalId).classList.remove('active'); document.getElementById(modalId).classList.remove('active');
} }
function openResetPasswordModal(userId, username) { function openResetPasswordModal(userId, username) {
document.getElementById('resetUsername').textContent = username; document.getElementById('resetUsername').textContent = username;
document.getElementById('resetPasswordForm').action = `/admin/users/${userId}/reset-password`; document.getElementById('resetPasswordForm').action = `/admin/users/${userId}/reset-password`;
openModal('resetPasswordModal'); openModal('resetPasswordModal');
} }
// Close modal when clicking outside // Close modal when clicking outside
window.onclick = function(event) { window.onclick = function (event) {
if (event.target.classList.contains('modal')) { if (event.target.classList.contains('modal')) {
event.target.classList.remove('active'); event.target.classList.remove('active');
} }
} }
</script> </script>
{% endblock %} {% endblock %}

View File

@@ -21,7 +21,8 @@
</div> </div>
</div> </div>
<div style="background: white; border: 1px solid var(--border); border-radius: 8px; padding: 20px; margin-bottom: 30px;"> <div
style="background: white; border: 1px solid var(--border); border-radius: 8px; padding: 20px; margin-bottom: 30px;">
<div class="detail-row"> <div class="detail-row">
<div class="detail-label">Branch:</div> <div class="detail-label">Branch:</div>
<div class="detail-value">{{ branch_name }}</div> <div class="detail-value">{{ branch_name }}</div>
@@ -41,15 +42,16 @@
<form method="POST" action="{{ url_for('jobs.submit_final') }}"> <form method="POST" action="{{ url_for('jobs.submit_final') }}">
<input type="hidden" name="branch_name" value="{{ branch_name }}"> <input type="hidden" name="branch_name" value="{{ branch_name }}">
<input type="hidden" name="scenarios" value="{{ scenarios|tojson }}"> <input type="hidden" name="scenarios" value='{{ scenarios|tojson }}'>
<input type="hidden" name="scenario_map" value="{{ scenario_map|tojson }}"> <input type="hidden" name="scenario_map" value='{{ scenario_map|tojson }}'>
<!-- Default values for deactivated sections --> <!-- Default values for deactivated sections -->
<input type="hidden" name="environment" value="staging"> <input type="hidden" name="environment" value="staging">
<input type="hidden" name="test_mode" value="simulator"> <input type="hidden" name="test_mode" value="simulator">
<div class="form-actions"> <div class="form-actions">
<button type="button" class="btn" style="background: #6b7280; color: white;" onclick="history.back()">Back</button> <button type="button" class="btn" style="background: #6b7280; color: white;"
onclick="history.back()">Back</button>
<button type="submit" class="btn btn-success" style="padding: 12px 40px;">Submit Job</button> <button type="submit" class="btn btn-success" style="padding: 12px 40px;">Submit Job</button>
</div> </div>
</form> </form>