artin/API-Manager
1
0
Fork 0
mirror of https://github.com/OpenBankProject/API-Manager.git synced 2026-02-06 18:06:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #220 from Reena-cell/develop

Browse Source 
change ATM and ATM Create url
This commit is contained in:
Simon Redfern 2022-09-16 10:29:04 +02:00 committed by GitHub
commit db4318a41f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apimanager/apimanager/urls.py
View File

@ -38,8 +38,8 @@ urlpatterns += i18n_patterns(
url(r'^entitlementrequests/', include('entitlementrequests.urls')),
url(r'^users/', include('users.urls')),
url(r'^branches/', include('branches.urls')),
url(r'^atms/list', include('atms.urls')),
url(r'^atms/detail/id', include('atmdetail.urls')),
url(r'^atms/create', include('atms.urls')),
url(r'^atms/list', include('atmdetail.urls')),
url(r'^customers/', include('customers.urls')),
url(r'^metrics/', include('metrics.urls')),
url(r'^config/', include('config.urls')),

2
apimanager/atmdetail/templates/atmsView/atmdetail.html → apimanager/atmdetail/templates/atmsView/atmlist.html
View File

@ -1,7 +1,7 @@
{% extends 'base.html' %} {% load static %} {% load i18n %}
{% block page_title %} {{ block.super }} / {% trans "ATMs Detail" %}{% endblock page_title %} {% block content %}
<div id="atms">
<h1>{% trans "ATMs List" %}</h1>
<h1>{% trans "ATM List" %}</h1>
<form class="form-inline" method="get">
<input type="submit" class="btn btn-default" value ='{% trans "Export CSV" %}' onclick="javascript: form.action='{% url 'export-csv' %}';">
</form>

2
apimanager/atmdetail/urls.py
View File

@ -9,7 +9,7 @@ from .views import AtmListView, ExportCsvView
urlpatterns = [
url(r'^$',
AtmListView.as_view(),
name='atm-detail'),
name='atm-list'),
url(r'^export_csv$',
ExportCsvView.as_view(),
name='export-csv')

2
apimanager/atmdetail/views.py
View File

@ -19,7 +19,7 @@ import csv
class AtmListView(IndexAtmsView, LoginRequiredMixin, FormView ):
template_name = "atmsView/atmdetail.html"
template_name = "atmsView/atmlist.html"
success_url = '/atmsView/'
def get_banks(self):
api = API(self.request.session.get('obp'))

2
apimanager/atms/templates/atms/index.html
View File

@ -1,6 +1,6 @@
{% extends 'base.html' %} {% load static %} {% load i18n %} {% block page_title %}{{ block.super }} / Atms{% endblock page_title %} {% block content %}
<div id="atms_list">
<h1>{% trans "ATM Detail" %}</h1>
<h1>{% trans "ATM Create" %}</h1>
<form method="post">
{% csrf_token %} {% if form.non_field_errors %}

2
apimanager/atms/urls.py
View File

@ -9,7 +9,7 @@ from .views import IndexAtmsView, UpdateAtmsView
urlpatterns = [
url(r'^$',
IndexAtmsView.as_view(),
name='atms_list'),
name='atms_create'),
url(r'^update/(?P<atm_id>[ 0-9\w|\W\@\.\+-]+)/bank/(?P<bank_id>[0-9\w\@\.\+-]+)/$',
UpdateAtmsView.as_view(),
name='atms_update'),

2
apimanager/atms/views.py
View File

@ -182,7 +182,7 @@ class IndexAtmsView(LoginRequiredMixin, FormView):
class UpdateAtmsView(LoginRequiredMixin, FormView):
template_name = "atms/update.html"
success_url = '/atms/'
success_url = '/atms/list'
form_class = CreateAtmForm
def dispatch(self, request, *args, **kwargs):

8
apimanager/base/templates/base.html
View File

@ -74,15 +74,15 @@
</li>
{% url "branches_list" as branches_list_url %}
{% url "customers-create" as customers_create_url %}
{% url "atms_list" as atms_list_url %}
{% url "atm-detail" as atm_detail_url %}
{% url "atms_create" as atms_create_url %}
{% url "atm-list" as atm_list_url %}
<li class="dropdown{% if customers_create_url in request.path %} active{% endif %}">
<a href="#" data-toggle="dropdown" class="dropdown-toggle">{% trans "Resources" %}</a>
<ul class="dropdown-menu">
<li {% if customers_create_url in request.path %} class="active"{% endif %}><a href="{{ customers_create_url }}">{% trans "Customers" %}</a></li><hr class="dropdown-hr">
<li {% if branches_list_url in request.path %} class="active"{% endif %}><a href="{{ branches_list_url }}">{% trans "Branches" %}</a></li>
<li {% if atms_list_url in request.path %} class="active"{% endif %}><a href="{{ atms_list_url }}">{% trans "ATMs" %}</a></li>
<li {% if atm_detail_url in request.path %} class="active"{% endif %}><a href="{{ atm_detail_url }}">{% trans "ATMs Detail" %}</a></li>
<li {% if atms_create_url in request.path %} class="active"{% endif %}><a href="{{ atms_create_url }}">{% trans "ATM Create" %}</a></li>
<li {% if atm_list_url in request.path %} class="active"{% endif %}><a href="{{ atm_list_url }}">{% trans "ATM List" %}</a></li>
</ul>
</li>
{% url "config-index" as config_index_url %}