icurfer/butler_ddochi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ip관리대장 검색기능 추가
All checks were successful
Build And Test / build-and-push (push) Successful in 4m20s
Details

Browse Source
This commit is contained in:
sdjo 2024-12-16 14:28:49 +09:00
parent c3f86c0902
commit 222c90b5d9
3 changed files with 218 additions and 170 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

341
butler/templates/butler/ip_mgmt.html
View File

@ -3,175 +3,198 @@
{% block title %}IP Management{% endblock %} {% block title %}IP Management{% endblock %}
{% block main_area %} {% block main_area %}
<h2 class="fw-bold pt-3 pb-2">IP 관리 대장</h2> <h2 class="fw-bold pt-3 pb-2">IP 관리 대장</h2>
{% if not request.user.is_authenticated %} {% if not request.user.is_authenticated %}
<p class="text-danger">비로그인 익명사용자로 접근 중입니다. <p class="text-danger">비로그인 익명사용자로 접근 중입니다.
<br>로그인시 로그인 사용자가 등록한 데이터만 조회됩니다.</p> <br>로그인시 로그인 사용자가 등록한 데이터만 조회됩니다.
{% endif %} </p>
<!-- IP 레코드 목록 --> {% endif %}
<form id="recordForm" method="post" action=""> <!-- 검색 폼 -->
{% csrf_token %} <div class="row">
<table class="table table-striped table-hover table-bordered"> <div class="col-4">
<thead class="table-dark"> </div>
<tr> <div class="col-4">
<th scope="col">Select</th> </div>
<th scope="col">Network Name</th> <div class="col-4">
<th scope="col">IP Address</th> <form method="get" class="mb-3">
<th scope="col">Server Name</th> <div class="input-group">
<th scope="col">Description</th> <input type="text" name="var_search" class="form-control" placeholder="Search by Author or Network Name..."
<th scope="col">Remark</th> value="{{ var_search }}">
<th scope="col">Author</th> <button type="submit" class="btn btn-outline-primary">Search</button>
<th scope="col">Updated At</th> </div>
</tr> </form>
</thead> </div>
<tbody> </div>
{% for record in records %} <!-- IP 레코드 목록 -->
<tr data-record-id="{{ record.id }}"> <form id="recordForm" method="post" action="">
<td class="text-center"> {% csrf_token %}
<input type="checkbox" name="selected_records" value="{{ record.id }}" class="form-check-input record-checkbox"> <table class="table table-striped table-hover table-bordered">
</td> <thead class="table-dark">
<td>{{ record.network_nm }}</td> <tr>
<td>{{ record.ip_addrs }}</td> <th scope="col">Select</th>
<td>{{ record.svr_nm }}</td> <th scope="col">Network Name</th>
<td>{{ record.desc }}</td> <th scope="col">IP Address</th>
<td>{{ record.remark }}</td> <th scope="col">Server Name</th>
<td>{{ record.author }}</td> <th scope="col">Description</th>
<td>{{ record.updated_at|date:"Y-m-d H:i" }}</td> <th scope="col">Remark</th>
</tr> <th scope="col">Author</th>
<th scope="col">Updated At</th>
</tr>
</thead>
<tbody>
{% for record in records %}
<tr data-record-id="{{ record.id }}">
<td class="text-center">
<input type="checkbox" name="selected_records" value="{{ record.id }}"
class="form-check-input record-checkbox">
</td>
<td>{{ record.network_nm }}</td>
<td>{{ record.ip_addrs }}</td>
<td>{{ record.svr_nm }}</td>
<td>{{ record.desc }}</td>
<td>{{ record.remark }}</td>
<td>{{ record.author }}</td>
<td>{{ record.updated_at|date:"Y-m-d H:i" }}</td>
</tr>
<!-- 수정 모달 --> <!-- 수정 모달 -->
<div class="modal fade" id="editDataModal-{{ record.id }}" tabindex="-1" aria-labelledby="editDataModalLabel-{{ record.id }}" aria-hidden="true"> <div class="modal fade" id="editDataModal-{{ record.id }}" tabindex="-1"
<div class="modal-dialog"> aria-labelledby="editDataModalLabel-{{ record.id }}" aria-hidden="true">
<div class="modal-content"> <div class="modal-dialog">
<div class="modal-header bg-warning text-dark"> <div class="modal-content">
<h5 class="modal-title" id="editDataModalLabel-{{ record.id }}">Edit IP Record</h5> <div class="modal-header bg-warning text-dark">
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button> <h5 class="modal-title" id="editDataModalLabel-{{ record.id }}">Edit IP Record</h5>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">
<!-- 데이터 수정 폼 -->
<form id="editDataForm-{{ record.id }}" method="post" action="{% url 'butler:ip_mgmt_edit' record.id %}">
{% csrf_token %}
<div class="mb-3">
<label for="networkNm-{{ record.id }}" class="form-label">Network Name</label>
<input type="text" class="form-control" id="networkNm-{{ record.id }}" name="network_nm"
value="{{ record.network_nm }}" required="required">
</div> </div>
<div class="modal-body"> <div class="mb-3">
<!-- 데이터 수정 폼 --> <label for="ipAddrs-{{ record.id }}" class="form-label">IP Address</label>
<form id="editDataForm-{{ record.id }}" method="post" action="{% url 'butler:ip_mgmt_edit' record.id %}"> <input type="text" class="form-control" id="ipAddrs-{{ record.id }}" name="ip_addrs"
{% csrf_token %} value="{{ record.ip_addrs }}" required="required">
<div class="mb-3">
<label for="networkNm-{{ record.id }}" class="form-label">Network Name</label>
<input type="text" class="form-control" id="networkNm-{{ record.id }}" name="network_nm" value="{{ record.network_nm }}" required="required">
</div>
<div class="mb-3">
<label for="ipAddrs-{{ record.id }}" class="form-label">IP Address</label>
<input type="text" class="form-control" id="ipAddrs-{{ record.id }}" name="ip_addrs" value="{{ record.ip_addrs }}" required="required">
</div>
<div class="mb-3">
<label for="svrNm-{{ record.id }}" class="form-label">Server Name</label>
<input type="text" class="form-control" id="svrNm-{{ record.id }}" name="svr_nm" value="{{ record.svr_nm }}" required="required">
</div>
<div class="mb-3">
<label for="desc-{{ record.id }}" class="form-label">Description</label>
<textarea class="form-control" id="desc-{{ record.id }}" name="desc">{{ record.desc }}</textarea>
</div>
<div class="mb-3">
<label for="remark-{{ record.id }}" class="form-label">Remark</label>
<textarea class="form-control" id="remark-{{ record.id }}" name="remark">{{ record.remark }}</textarea>
</div>
<button type="submit" class="btn btn-primary">Save Changes</button>
</form>
</div> </div>
</div> <div class="mb-3">
<label for="svrNm-{{ record.id }}" class="form-label">Server Name</label>
<input type="text" class="form-control" id="svrNm-{{ record.id }}" name="svr_nm"
value="{{ record.svr_nm }}" required="required">
</div>
<div class="mb-3">
<label for="desc-{{ record.id }}" class="form-label">Description</label>
<textarea class="form-control" id="desc-{{ record.id }}" name="desc">{{ record.desc }}</textarea>
</div>
<div class="mb-3">
<label for="remark-{{ record.id }}" class="form-label">Remark</label>
<textarea class="form-control" id="remark-{{ record.id }}"
name="remark">{{ record.remark }}</textarea>
</div>
<button type="submit" class="btn btn-primary">Save Changes</button>
</form>
</div> </div>
</div> </div>
{% empty %} </div>
<tr>
<td colspan="9" class="text-center">No records found.</td>
</tr>
{% endfor %}
</tbody>
</table>
{% if request.user.is_authenticated %}
<!-- 버튼 컨테이너 -->
<div class="d-flex justify-content-between align-items-center mb-3">
<!-- 데이터 등록 버튼 -->
<button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#addDataModal">
<i class="bi bi-plus-lg"></i>
Add New IP Record
</button>
<!-- 전체 삭제 버튼 -->
<button type="submit" formaction="{% url 'butler:ip_mgmt_delete' %}" class="btn btn-danger">
<i class="bi bi-trash"></i>
Delete Selected
</button>
<!-- 수정 버튼 -->
<button type="button" id="editSelectedButton" class="btn btn-warning" disabled="disabled">
<i class="bi bi-pencil-square"></i>
Edit Selected
</button>
</div> </div>
{% endif %} {% empty %}
</form> <tr>
<td colspan="9" class="text-center">No records found.</td>
</tr>
{% endfor %}
</tbody>
</table>
{% if request.user.is_authenticated %}
<!-- 버튼 컨테이너 -->
<div class="d-flex justify-content-between align-items-center mb-3">
<!-- 데이터 등록 버튼 -->
<button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#addDataModal">
<i class="bi bi-plus-lg"></i>
Add New IP Record
</button>
<!-- 데이터 등록 모달 --> <!-- 전체 삭제 버튼 -->
<div class="modal fade" id="addDataModal" tabindex="-1" aria-labelledby="addDataModalLabel" aria-hidden="true"> <button type="submit" formaction="{% url 'butler:ip_mgmt_delete' %}" class="btn btn-danger">
<div class="modal-dialog"> <i class="bi bi-trash"></i>
<div class="modal-content"> Delete Selected
<div class="modal-header bg-success text-white"> </button>
<h5 class="modal-title" id="addDataModalLabel">Add New IP Record</h5>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button> <!-- 수정 버튼 -->
</div> <button type="button" id="editSelectedButton" class="btn btn-warning" disabled="disabled">
<div class="modal-body"> <i class="bi bi-pencil-square"></i>
<!-- 데이터 등록 폼 --> Edit Selected
<form id="addDataForm" method="post" action="{% url 'butler:ip_mgmt_add' %}"> </button>
{% csrf_token %} </div>
<div class="mb-3"> {% endif %}
<label for="networkNm" class="form-label">Network Name</label> </form>
<input type="text" class="form-control" id="networkNm" name="network_nm" required="required">
</div> <!-- 데이터 등록 모달 -->
<div class="mb-3"> <div class="modal fade" id="addDataModal" tabindex="-1" aria-labelledby="addDataModalLabel" aria-hidden="true">
<label for="ipAddrs" class="form-label">IP Address</label> <div class="modal-dialog">
<input type="text" class="form-control" id="ipAddrs" name="ip_addrs" required="required"> <div class="modal-content">
</div> <div class="modal-header bg-success text-white">
<div class="mb-3"> <h5 class="modal-title" id="addDataModalLabel">Add New IP Record</h5>
<label for="svrNm" class="form-label">Server Name</label> <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
<input type="text" class="form-control" id="svrNm" name="svr_nm" required="required"> </div>
</div> <div class="modal-body">
<div class="mb-3"> <!-- 데이터 등록 폼 -->
<label for="desc" class="form-label">Description</label> <form id="addDataForm" method="post" action="{% url 'butler:ip_mgmt_add' %}">
<textarea class="form-control" id="desc" name="desc"></textarea> {% csrf_token %}
</div> <div class="mb-3">
<div class="mb-3"> <label for="networkNm" class="form-label">Network Name</label>
<label for="remark" class="form-label">Remark</label> <input type="text" class="form-control" id="networkNm" name="network_nm" required="required">
<textarea class="form-control" id="remark" name="remark"></textarea> </div>
</div> <div class="mb-3">
<button type="submit" class="btn btn-primary">Submit</button> <label for="ipAddrs" class="form-label">IP Address</label>
</form> <input type="text" class="form-control" id="ipAddrs" name="ip_addrs" required="required">
</div> </div>
<div class="mb-3">
<label for="svrNm" class="form-label">Server Name</label>
<input type="text" class="form-control" id="svrNm" name="svr_nm" required="required">
</div>
<div class="mb-3">
<label for="desc" class="form-label">Description</label>
<textarea class="form-control" id="desc" name="desc"></textarea>
</div>
<div class="mb-3">
<label for="remark" class="form-label">Remark</label>
<textarea class="form-control" id="remark" name="remark"></textarea>
</div>
<button type="submit" class="btn btn-primary">Submit</button>
</form>
</div> </div>
</div> </div>
</div> </div>
</div>
<script> <script>
document.addEventListener('DOMContentLoaded', function () { document.addEventListener('DOMContentLoaded', function () {
const editButton = document.getElementById('editSelectedButton'); const editButton = document.getElementById('editSelectedButton');
const checkboxes = document.querySelectorAll('.record-checkbox'); const checkboxes = document.querySelectorAll('.record-checkbox');
// Event listener to enable/disable the edit button // Event listener to enable/disable the edit button
document.addEventListener('change', function () { document.addEventListener('change', function () {
const selected = [...checkboxes].filter(checkbox => checkbox.checked); const selected = [...checkboxes].filter(checkbox => checkbox.checked);
if (selected.length === 1) { if (selected.length === 1) {
editButton.disabled = false; editButton.disabled = false;
editButton.dataset.recordId = selected[0].value; editButton.dataset.recordId = selected[0].value;
} else { } else {
editButton.disabled = true; editButton.disabled = true;
delete editButton.dataset.recordId; delete editButton.dataset.recordId;
} }
});
// Event listener to open the edit modal
editButton.addEventListener('click', function () {
const recordId = editButton.dataset.recordId;
if (recordId) {
const modal = new bootstrap.Modal(document.getElementById(`editDataModal-${recordId}`));
modal.show();
}
});
}); });
</script>
{% endblock %} // Event listener to open the edit modal
editButton.addEventListener('click', function () {
const recordId = editButton.dataset.recordId;
if (recordId) {
const modal = new bootstrap.Modal(document.getElementById(`editDataModal-${recordId}`));
modal.show();
}
});
});
</script>
{% endblock %}

45
butler/views.py
View File

@ -3,6 +3,7 @@ from pathlib import Path
import markdown import markdown
import os import os
from .models import NoticeBoard, IPManagementRecord from .models import NoticeBoard, IPManagementRecord
from django.db.models import Q
def hello_view(request): def hello_view(request):
@ -28,16 +29,40 @@ def notice_detail_view(request, pk):
# --- ip management --- # --- ip management ---
# def ip_mgmt_view(request):
# # records = IPManagementRecord.objects.all()
# if request.user.is_authenticated:
# # records = IPManagementRecord.objects.filter(author=request.user).order_by(
# records = IPManagementRecord.objects.order_by(
# "ip_addrs"
# )
# else:
# # records = IPManagementRecord.objects.none()
# records = IPManagementRecord.objects.all().order_by("ip_addrs")
# return render(request, "butler/ip_mgmt.html", {"records": records})
def ip_mgmt_view(request): def ip_mgmt_view(request):
# records = IPManagementRecord.objects.all() query = request.GET.get("var_search", "").strip()
if request.user.is_authenticated:
records = IPManagementRecord.objects.filter(author=request.user).order_by( records = IPManagementRecord.objects.order_by(
"ip_addrs" "ip_addrs"
)
if query:
records = records.filter(
# Q(author__username__icontains=query) | Q(author__email__icontains=query)
Q(author__username__icontains=query) | Q(network_nm__icontains=query)
) )
else: """
# records = IPManagementRecord.objects.none() SELECT * FROM ip_management_record AS ip JOIN auth_user AS au
records = IPManagementRecord.objects.all().order_by("ip_addrs") ON ip.author_id = au.id
return render(request, "butler/ip_mgmt.html", {"records": records}) WHERE au.username LIKE CONCAT('%', 조회할 값, '%')
OR au.email LIKE CONCAT('%', 조회할 값, '%')
ORDER BY ip.ip_addrs;
"""
records = records.order_by("ip_addrs")
return render(request, "butler/ip_mgmt.html", {"records": records, "var_search": query})
def add_ip_record(request): def add_ip_record(request):
@ -93,9 +118,9 @@ def privacy_view(request):
with open(file_path, "r", encoding="utf-8") as file: with open(file_path, "r", encoding="utf-8") as file:
text = file.read() text = file.read()
file_path = Path('docs/docs_md_files/privacy.md') file_path = Path("docs/docs_md_files/privacy.md")
with file_path.open('r', encoding='utf-8') as file: with file_path.open("r", encoding="utf-8") as file:
text = file.read() text = file.read()
# Markdown을 HTML로 변환 # Markdown을 HTML로 변환
# html_content = markdown.markdown(text) # html_content = markdown.markdown(text)

2
version
View File

@ -1 +1 @@
dev_0.0.19r1 dev_0.0.20