moved get_current_matchday url to ofm

Author: StegSchreck

core/ofm_urls.py

@@ -1,12 +1,13 @@
 from django.conf.urls import url
 
-from core.views.ofm.finance_views import FinanceDataView, FinancesAsJsonView, FinanceBalanceChartView, \
-                                         FinanceIncomeChartView, FinanceExpensesChartView
-from core.views.ofm.match_views import MatchesView, MatchesAsJsonView, MatchesSummaryJsonView
-from core.views.ofm.player_views import PlayerStatisticsView, PlayerStatisticsAsJsonView, \
-                                        PlayerDetailView, PlayerChartView
-from core.views.ofm.stadium_views import StadiumStatisticsView, StadiumStatisticsAsJsonView, StadiumDetailView, \
-                                         StadiumStandStatisticsView, StadiumStandStatisticsChartView
+from core.views.ofm.base_views import GetCurrentMatchdayView
+from core.views.ofm.finance_views import FinanceBalanceChartView, FinanceDataView, FinanceExpensesChartView, \
+                                         FinanceIncomeChartView, FinancesAsJsonView
+from core.views.ofm.match_views import MatchesAsJsonView, MatchesSummaryJsonView, MatchesView
+from core.views.ofm.player_views import PlayerChartView, PlayerDetailView, PlayerStatisticsAsJsonView, \
+                                        PlayerStatisticsView
+from core.views.ofm.stadium_views import StadiumDetailView, StadiumStandStatisticsChartView, StadiumStandStatisticsView, \
+                                         StadiumStatisticsAsJsonView, StadiumStatisticsView
 
 app_name = 'ofm'
 urlpatterns = [
@@ -31,4 +32,6 @@
     url(r'^stadium_stand/?$', StadiumStandStatisticsView.as_view(), name='stadium_stand_statistics'),
     url(r'^stadium_stand_chart_json/?$', StadiumStandStatisticsChartView.as_view(),
         name='stadium_stand_statistics_chart_json'),
+
+    url(r'^get_current_matchday/?$', GetCurrentMatchdayView.as_view(), name='get_current_matchday'),
 ]

core/static/core/js/checklist_user_handler.js

@@ -21,7 +21,7 @@ $('document').ready( function (){
                 data.forEach(showChecklistItem);
             }
         );
-        $.get("/get_current_matchday",
+        $.get("/ofm/get_current_matchday",
             function (data) {
                 $('#ChecklistBar').find('a').append(
                     "<span class='current_matchday'>" +

core/tests/unit/views/test_settings_view.py

@@ -96,7 +96,7 @@ def test_change_password_when_unmatching(self):
     def test_get_current_matchday(self):
         MatchdayFactory.create()
         self.client.login(username='temporary', password='temporary')
-        response = self.client.get(reverse('core:get_current_matchday'))
+        response = self.client.get(reverse('core:ofm:get_current_matchday'))
         self.assertEqual(response.status_code, 200)
         returned_json_data = json.loads(response.content.decode('utf-8'))
         self.assertEqual(returned_json_data['matchday_number'], 0)

core/urls.py

@@ -1,12 +1,12 @@
-from django.conf.urls import url, include
-from django.views.generic.base import TemplateView, RedirectView
+from django.conf.urls import include, url
+from django.views.generic.base import RedirectView, TemplateView
 
 import core.views.account_views
 import core.views.settings_views
 import core.views.trigger_parsing_views
-from core.views.base_views import GetCurrentMatchdayView
-from core.views.checklist_views import GetChecklistItemsView, GetChecklistItemsForTodayView, CreateChecklistItemView, \
-    UpdateChecklistPriorityView, UpdateChecklistItemView, DeleteChecklistItemView
+from core.views.checklist_views import CreateChecklistItemView, DeleteChecklistItemView, \
+                                       GetChecklistItemsForTodayView, GetChecklistItemsView, \
+                                       UpdateChecklistItemView, UpdateChecklistPriorityView
 
 app_name = 'core'
 urlpatterns = [
@@ -17,7 +17,6 @@
     url(r'^account/?$', core.views.account_views.account_view, name='account'),
     url(r'^logout/?$', core.views.account_views.logout_view, name='logout'),
     url(r'^ofm/', include('core.ofm_urls'), name='ofm'),
-    url(r'^get_current_matchday/?$', GetCurrentMatchdayView.as_view(), name='get_current_matchday'),
 
     url(r'^settings/?$', core.views.settings_views.settings_view,
         name='settings'),