diff --git a/apimanager/apimanager/settings.py b/apimanager/apimanager/settings.py index 604988c..ba29889 100644 --- a/apimanager/apimanager/settings.py +++ b/apimanager/apimanager/settings.py @@ -53,7 +53,7 @@ INSTALLED_APPS = [ 'users', 'branches', 'atms', - 'atmDetail', + 'atmdetail', 'entitlementrequests', 'customers', 'metrics', diff --git a/apimanager/apimanager/urls.py b/apimanager/apimanager/urls.py index a356277..2fabb9f 100644 --- a/apimanager/apimanager/urls.py +++ b/apimanager/apimanager/urls.py @@ -39,7 +39,7 @@ urlpatterns += i18n_patterns( url(r'^users/', include('users.urls')), url(r'^branches/', include('branches.urls')), url(r'^atms/', include('atms.urls')), - url(r'^atm_detail/', include('atmDetail.urls')), + url(r'^atm-detail/', include('atmdetail.urls')), url(r'^customers/', include('customers.urls')), url(r'^metrics/', include('metrics.urls')), url(r'^config/', include('config.urls')), diff --git a/apimanager/atmDetail/__init__.py b/apimanager/atmdetail/__init__.py similarity index 100% rename from apimanager/atmDetail/__init__.py rename to apimanager/atmdetail/__init__.py diff --git a/apimanager/atmDetail/admin.py b/apimanager/atmdetail/admin.py similarity index 100% rename from apimanager/atmDetail/admin.py rename to apimanager/atmdetail/admin.py diff --git a/apimanager/atmDetail/apps.py b/apimanager/atmdetail/apps.py similarity index 100% rename from apimanager/atmDetail/apps.py rename to apimanager/atmdetail/apps.py diff --git a/apimanager/atmDetail/forms.py b/apimanager/atmdetail/forms.py similarity index 99% rename from apimanager/atmDetail/forms.py rename to apimanager/atmdetail/forms.py index 99c1037..489c8cc 100644 --- a/apimanager/atmDetail/forms.py +++ b/apimanager/atmdetail/forms.py @@ -189,7 +189,7 @@ class CreateAtmForm(forms.Form): label=_('ATM location'), widget=forms.TextInput( attrs={ - 'placeholder': _('OBP'), + 'placeholder': 'OBP', 'class': 'form-control', } ), diff --git a/apimanager/atmDetail/models.py b/apimanager/atmdetail/models.py similarity index 100% rename from apimanager/atmDetail/models.py rename to apimanager/atmdetail/models.py diff --git a/apimanager/atmDetail/static/atms/css/atms.css b/apimanager/atmdetail/static/atms/css/atms.css similarity index 100% rename from apimanager/atmDetail/static/atms/css/atms.css rename to apimanager/atmdetail/static/atms/css/atms.css diff --git a/apimanager/atmDetail/static/atms/js/atms.js b/apimanager/atmdetail/static/atms/js/atms.js similarity index 100% rename from apimanager/atmDetail/static/atms/js/atms.js rename to apimanager/atmdetail/static/atms/js/atms.js diff --git a/apimanager/atmDetail/templates/atmsView/atm_List.html b/apimanager/atmdetail/templates/atmsView/atmdetail.html similarity index 88% rename from apimanager/atmDetail/templates/atmsView/atm_List.html rename to apimanager/atmdetail/templates/atmsView/atmdetail.html index 4ed2170..b048a43 100644 --- a/apimanager/atmDetail/templates/atmsView/atm_List.html +++ b/apimanager/atmdetail/templates/atmsView/atmdetail.html @@ -1,7 +1,7 @@ {% extends 'base.html' %} {% load static %} {% load i18n %} -{% block page_title %} /atms_detail{% endblock page_title %} {% block content %} +{% block page_title %} {% trans "API Manager" %}/{% trans "ATMs Detail" %}{% endblock page_title %} {% block content %}
-

{% trans "ATMs Detail" %}

+

{% trans "ATMs List" %}

diff --git a/apimanager/atmDetail/tests.py b/apimanager/atmdetail/tests.py similarity index 100% rename from apimanager/atmDetail/tests.py rename to apimanager/atmdetail/tests.py diff --git a/apimanager/atmDetail/urls.py b/apimanager/atmdetail/urls.py similarity index 87% rename from apimanager/atmDetail/urls.py rename to apimanager/atmdetail/urls.py index 4c96972..fe08919 100644 --- a/apimanager/atmDetail/urls.py +++ b/apimanager/atmdetail/urls.py @@ -9,5 +9,5 @@ from .views import AtmListView urlpatterns = [ url(r'^$', AtmListView.as_view(), - name='atm_detail') + name='atm-detail') ] diff --git a/apimanager/atmDetail/views.py b/apimanager/atmdetail/views.py similarity index 97% rename from apimanager/atmDetail/views.py rename to apimanager/atmdetail/views.py index 0b01317..dce864d 100644 --- a/apimanager/atmDetail/views.py +++ b/apimanager/atmdetail/views.py @@ -16,7 +16,7 @@ from obp.api import API, APIError class AtmListView(IndexAtmsView, LoginRequiredMixin, FormView ): - template_name = "atmsView/atm_List.html" + template_name = "atmsView/atmdetail.html" success_url = '/atmsView/' def get_banks(self): api = API(self.request.session.get('obp')) diff --git a/apimanager/atms/forms.py b/apimanager/atms/forms.py index 25701e6..348195a 100644 --- a/apimanager/atms/forms.py +++ b/apimanager/atms/forms.py @@ -100,7 +100,7 @@ class CreateAtmForm(forms.Form): label=_('Opening Hours'), widget=forms.Textarea( attrs={ - 'placeholder': _('None'), + 'placeholder': 'None', 'class': 'form-control', } ), @@ -110,7 +110,7 @@ class CreateAtmForm(forms.Form): label=_('Monday'), widget=forms.TextInput( attrs={ - 'placeholder': _('None'), + 'placeholder': 'None', 'class': 'form-control', } ), @@ -120,7 +120,7 @@ class CreateAtmForm(forms.Form): label=_('Tuesday'), widget=forms.TextInput( attrs={ - 'placeholder': _('None'), + 'placeholder': 'None', 'class': 'form-control', } ), @@ -130,7 +130,7 @@ class CreateAtmForm(forms.Form): label=_('Wednesday'), widget=forms.TextInput( attrs={ - 'placeholder': _('None'), + 'placeholder': 'None', 'class': 'form-control', } ), @@ -140,7 +140,7 @@ class CreateAtmForm(forms.Form): label=_('Thursday'), widget=forms.TextInput( attrs={ - 'placeholder': _('None'), + 'placeholder': 'None', 'class': 'form-control', } ), @@ -150,7 +150,7 @@ class CreateAtmForm(forms.Form): label=_('Friday'), widget=forms.TextInput( attrs={ - 'placeholder': _('None'), + 'placeholder': 'None', 'class': 'form-control', } ), @@ -160,7 +160,7 @@ class CreateAtmForm(forms.Form): label=_('Saturday'), widget=forms.TextInput( attrs={ - 'placeholder': _('None'), + 'placeholder': 'None', 'class': 'form-control', } ), @@ -170,7 +170,7 @@ class CreateAtmForm(forms.Form): label=_('Sunday'), widget=forms.TextInput( attrs={ - 'placeholder': _('None'), + 'placeholder': 'None', 'class': 'form-control', } ), diff --git a/apimanager/base/templates/base.html b/apimanager/base/templates/base.html index 13cf62b..ebdd113 100644 --- a/apimanager/base/templates/base.html +++ b/apimanager/base/templates/base.html @@ -75,7 +75,7 @@ {% 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 "atm-detail" as atm_detail_url %}
  • {% trans "Resources" %}
      diff --git a/apimanager/users/templates/users/detail.html b/apimanager/users/templates/users/detail.html index 250e7fd..51ac0a3 100644 --- a/apimanager/users/templates/users/detail.html +++ b/apimanager/users/templates/users/detail.html @@ -36,24 +36,22 @@ {% trans "Locked" %}
      {{ apiuser.is_locked }} - +
      {% csrf_token %} {% if apiuser.is_deleted %} - + {% else %} {% endif %} - - {% if apiuser.is_locked %} - - {% else %} + {% if apiuser.is_locked %} + + {% else %} + + {% endif %} - {% endif %} - - diff --git a/apimanager/users/views.py b/apimanager/users/views.py index 7d54e0f..46bdb2a 100644 --- a/apimanager/users/views.py +++ b/apimanager/users/views.py @@ -14,7 +14,6 @@ from obp.api import API, APIError from .forms import AddEntitlementForm,CreateInvitationForm import csv - class FilterRoleName(BaseFilter): """Filter users by role names""" filter_type = 'role_name' @@ -367,18 +366,32 @@ class UserStatusUpdateView(LoginRequiredMixin, View): else: msg = 'User with ID {} has been deleted.'.format(kwargs['user_id']) messages.success(request, msg) - else: - urlpath = '/users/{}/lock-status'.format(kwargs['username']) - result = api.put(urlpath, None) + elif(request.POST.get("Lock")): + urlpath = '/users/{}/locks'.format(kwargs['username']) + result = api.post(urlpath, None) if result is not None and 'code' in result and result['code'] >= 400: messages.error(request, result['message']) else: + msg = 'User {} has been lock.'.format(kwargs['username']) + messages.success(request, msg) + else: + urlpath = '/users/{}/lock-status'.format(kwargs['username']) + result = api.put(urlpath, None) + print("result", result) + #if result is not None and 'code' in result and result['code'] >= 400: + if 'code' in result and result['code'] == 404: msg = 'User {} has been unlocked.'.format(kwargs['username']) messages.success(request, msg) + else: + messages.error(request, result['message']) + #else: + # msg = 'User {} has been unlocked.'.format(kwargs['username']) + # messages.success(request, msg) + except APIError as err: messages.error(request, err) - except: - messages.error(self.request, 'Unknown Error') + except Exception as e: + messages.error(self.request, 'Unknown Error' + str(e)) # from sonarcloud: Change this code to not perform redirects based on user-controlled data. redirect_url_from_gui = request.POST.get('next', reverse('users-index'))