mirror of https://github.com/zulip/zulip.git
Denormalize urls in routes file.
Currently we use the deprecated django pattern() prefix pattern. This make it hard to read the router logic in zproject/urls.py This commit denormalizes the urls so that they can be read more easily, at the expense of some verbosity. This also makes it easier to reorganize urls in that file. We skip denomalizing rest_dispatch due to its unique complications.
This commit is contained in:
acrefoot
Tim Abbott
parent
5d21fb0681
commit
5a49c5e280
137
zproject/urls.py
137
zproject/urls.py
|
|
@ -103,81 +103,81 @@ if settings.DEVELOPMENT and settings.LOCAL_UPLOADS_DIR is not None:
|
|||
{'document_root': os.path.join(settings.LOCAL_UPLOADS_DIR, "avatars")}),
|
||||
)
|
||||
|
||||
urlpatterns += patterns('zerver.views',
|
||||
urlpatterns += [
|
||||
# These are json format views used by the web client. They require a logged in browser.
|
||||
url(r'^json/rename_stream$', 'streams.json_rename_stream'),
|
||||
url(r'^json/make_stream_public$', 'streams.json_make_stream_public'),
|
||||
url(r'^json/make_stream_private$', 'streams.json_make_stream_private'),
|
||||
url(r'^json/invite_users$', 'json_invite_users'),
|
||||
url(r'^json/bulk_invite_users$', 'json_bulk_invite_users'),
|
||||
url(r'^json/settings/change$', 'user_settings.json_change_settings'),
|
||||
url(r'^json/notify_settings/change$', 'user_settings.json_change_notify_settings'),
|
||||
url(r'^json/ui_settings/change$', 'user_settings.json_change_ui_settings'),
|
||||
url(r'^json/subscriptions/remove$', 'streams.json_remove_subscriptions'),
|
||||
url(r'^json/subscriptions/exists$', 'streams.json_stream_exists'),
|
||||
url(r'^json/subscriptions/property$', 'streams.json_subscription_property'),
|
||||
url(r'^json/get_subscribers$', 'streams.json_get_subscribers'),
|
||||
url(r'^json/fetch_api_key$', 'json_fetch_api_key'),
|
||||
url(r'^json/get_active_statuses$', 'json_get_active_statuses'),
|
||||
url(r'^json/tutorial_send_message$', 'tutorial.json_tutorial_send_message'),
|
||||
url(r'^json/tutorial_status$', 'tutorial.json_tutorial_status'),
|
||||
url(r'^json/report_error$', 'report.json_report_error'),
|
||||
url(r'^json/report_send_time$', 'report.json_report_send_time'),
|
||||
url(r'^json/report_narrow_time$', 'report.json_report_narrow_time'),
|
||||
url(r'^json/report_unnarrow_time$', 'report.json_report_unnarrow_time'),
|
||||
url(r'^json/upload_file$', 'upload.json_upload_file'),
|
||||
url(r'^json/messages_in_narrow$', 'messages.json_messages_in_narrow'),
|
||||
url(r'^json/update_message$', 'messages.json_update_message'),
|
||||
url(r'^json/fetch_raw_message$', 'messages.json_fetch_raw_message'),
|
||||
url(r'^json/refer_friend$', 'json_refer_friend'),
|
||||
url(r'^json/set_muted_topics$', 'json_set_muted_topics'),
|
||||
url(r'^json/set_avatar$', 'user_settings.json_set_avatar'),
|
||||
url(r'^json/time_setting$', 'user_settings.json_time_setting'),
|
||||
url(r'^json/left_side_userlist$', 'user_settings.json_left_side_userlist'),
|
||||
url(r'^json/rename_stream$', 'zerver.views.streams.json_rename_stream'),
|
||||
url(r'^json/make_stream_public$', 'zerver.views.streams.json_make_stream_public'),
|
||||
url(r'^json/make_stream_private$', 'zerver.views.streams.json_make_stream_private'),
|
||||
url(r'^json/invite_users$', 'zerver.views.json_invite_users'),
|
||||
url(r'^json/bulk_invite_users$', 'zerver.views.json_bulk_invite_users'),
|
||||
url(r'^json/settings/change$', 'zerver.views.user_settings.json_change_settings'),
|
||||
url(r'^json/notify_settings/change$', 'zerver.views.user_settings.json_change_notify_settings'),
|
||||
url(r'^json/ui_settings/change$', 'zerver.views.user_settings.json_change_ui_settings'),
|
||||
url(r'^json/subscriptions/remove$', 'zerver.views.streams.json_remove_subscriptions'),
|
||||
url(r'^json/subscriptions/exists$', 'zerver.views.streams.json_stream_exists'),
|
||||
url(r'^json/subscriptions/property$', 'zerver.views.streams.json_subscription_property'),
|
||||
url(r'^json/get_subscribers$', 'zerver.views.streams.json_get_subscribers'),
|
||||
url(r'^json/fetch_api_key$', 'zerver.views.json_fetch_api_key'),
|
||||
url(r'^json/get_active_statuses$', 'zerver.views.json_get_active_statuses'),
|
||||
url(r'^json/tutorial_send_message$', 'zerver.views.tutorial.json_tutorial_send_message'),
|
||||
url(r'^json/tutorial_status$', 'zerver.views.tutorial.json_tutorial_status'),
|
||||
url(r'^json/report_error$', 'zerver.views.report.json_report_error'),
|
||||
url(r'^json/report_send_time$', 'zerver.views.report.json_report_send_time'),
|
||||
url(r'^json/report_narrow_time$', 'zerver.views.report.json_report_narrow_time'),
|
||||
url(r'^json/report_unnarrow_time$', 'zerver.views.report.json_report_unnarrow_time'),
|
||||
url(r'^json/upload_file$', 'zerver.views.upload.json_upload_file'),
|
||||
url(r'^json/messages_in_narrow$', 'zerver.views.messages.json_messages_in_narrow'),
|
||||
url(r'^json/update_message$', 'zerver.views.messages.json_update_message'),
|
||||
url(r'^json/fetch_raw_message$', 'zerver.views.messages.json_fetch_raw_message'),
|
||||
url(r'^json/refer_friend$', 'zerver.views.json_refer_friend'),
|
||||
url(r'^json/set_muted_topics$', 'zerver.views.json_set_muted_topics'),
|
||||
url(r'^json/set_avatar$', 'zerver.views.user_settings.json_set_avatar'),
|
||||
url(r'^json/time_setting$', 'zerver.views.user_settings.json_time_setting'),
|
||||
url(r'^json/left_side_userlist$', 'zerver.views.user_settings.json_left_side_userlist'),
|
||||
|
||||
# This json format view is used by the LEGACY pre-REST API. It
|
||||
# requires an API key.
|
||||
url(r'^api/v1/send_message$', 'messages.api_send_message'),
|
||||
url(r'^api/v1/send_message$', 'zerver.views.messages.api_send_message'),
|
||||
|
||||
# This json format view used by the mobile apps accepts a username
|
||||
# password/pair and returns an API key.
|
||||
url(r'^api/v1/fetch_api_key$', 'api_fetch_api_key'),
|
||||
url(r'^api/v1/fetch_api_key$', 'zerver.views.api_fetch_api_key'),
|
||||
|
||||
# This is for the signing in through the devAuthBackEnd on mobile apps.
|
||||
url(r'^api/v1/dev_fetch_api_key$', 'api_dev_fetch_api_key'),
|
||||
url(r'^api/v1/dev_fetch_api_key$', 'zerver.views.api_dev_fetch_api_key'),
|
||||
# This is for fetching the emails of the admins and the users.
|
||||
url(r'^api/v1/dev_get_emails$', 'api_dev_get_emails'),
|
||||
url(r'^api/v1/dev_get_emails$', 'zerver.views.api_dev_get_emails'),
|
||||
|
||||
# Used to present the GOOGLE_CLIENT_ID to mobile apps
|
||||
url(r'^api/v1/fetch_google_client_id$', 'api_fetch_google_client_id'),
|
||||
url(r'^api/v1/fetch_google_client_id$', 'zerver.views.api_fetch_google_client_id'),
|
||||
|
||||
# Sorted integration-specific webhook callbacks.
|
||||
url(r'^api/v1/external/airbrake$', 'webhooks.airbrake.api_airbrake_webhook'),
|
||||
url(r'^api/v1/external/beanstalk$', 'webhooks.beanstalk.api_beanstalk_webhook'),
|
||||
url(r'^api/v1/external/bitbucket$', 'webhooks.bitbucket.api_bitbucket_webhook'),
|
||||
url(r'^api/v1/external/circleci$', 'webhooks.circleci.api_circleci_webhook'),
|
||||
url(r'^api/v1/external/codeship$', 'webhooks.codeship.api_codeship_webhook'),
|
||||
url(r'^api/v1/external/crashlytics$', 'webhooks.crashlytics.api_crashlytics_webhook'),
|
||||
url(r'^api/v1/external/desk$', 'webhooks.deskdotcom.api_deskdotcom_webhook'),
|
||||
url(r'^api/v1/external/freshdesk$', 'webhooks.freshdesk.api_freshdesk_webhook'),
|
||||
url(r'^api/v1/external/github$', 'webhooks.github.api_github_landing'),
|
||||
url(r'^api/v1/external/ifttt$', 'webhooks.ifttt.api_iftt_app_webhook'),
|
||||
url(r'^api/v1/external/jira$', 'webhooks.jira.api_jira_webhook'),
|
||||
url(r'^api/v1/external/newrelic$', 'webhooks.newrelic.api_newrelic_webhook'),
|
||||
url(r'^api/v1/external/pagerduty$', 'webhooks.pagerduty.api_pagerduty_webhook'),
|
||||
url(r'^api/v1/external/pingdom$', 'webhooks.pingdom.api_pingdom_webhook'),
|
||||
url(r'^api/v1/external/pivotal$', 'webhooks.pivotal.api_pivotal_webhook'),
|
||||
url(r'^api/v1/external/stash$', 'webhooks.stash.api_stash_webhook'),
|
||||
url(r'^api/v1/external/taiga$', 'webhooks.taiga.api_taiga_webhook'),
|
||||
url(r'^api/v1/external/teamcity$', 'webhooks.teamcity.api_teamcity_webhook'),
|
||||
url(r'^api/v1/external/transifex$', 'webhooks.transifex.api_transifex_webhook'),
|
||||
url(r'^api/v1/external/travis$', 'webhooks.travis.api_travis_webhook'),
|
||||
url(r'^api/v1/external/updown$', 'webhooks.updown.api_updown_webhook'),
|
||||
url(r'^api/v1/external/yo$', 'webhooks.yo.api_yo_app_webhook'),
|
||||
url(r'^api/v1/external/zendesk$', 'webhooks.zendesk.api_zendesk_webhook'),
|
||||
url(r'^api/v1/external/airbrake$', 'zerver.views.webhooks.airbrake.api_airbrake_webhook'),
|
||||
url(r'^api/v1/external/beanstalk$', 'zerver.views.webhooks.beanstalk.api_beanstalk_webhook'),
|
||||
url(r'^api/v1/external/bitbucket$', 'zerver.views.webhooks.bitbucket.api_bitbucket_webhook'),
|
||||
url(r'^api/v1/external/circleci$', 'zerver.views.webhooks.circleci.api_circleci_webhook'),
|
||||
url(r'^api/v1/external/codeship$', 'zerver.views.webhooks.codeship.api_codeship_webhook'),
|
||||
url(r'^api/v1/external/crashlytics$', 'zerver.views.webhooks.crashlytics.api_crashlytics_webhook'),
|
||||
url(r'^api/v1/external/desk$', 'zerver.views.webhooks.deskdotcom.api_deskdotcom_webhook'),
|
||||
url(r'^api/v1/external/freshdesk$', 'zerver.views.webhooks.freshdesk.api_freshdesk_webhook'),
|
||||
url(r'^api/v1/external/github$', 'zerver.views.webhooks.github.api_github_landing'),
|
||||
url(r'^api/v1/external/ifttt$', 'zerver.views.webhooks.ifttt.api_iftt_app_webhook'),
|
||||
url(r'^api/v1/external/jira$', 'zerver.views.webhooks.jira.api_jira_webhook'),
|
||||
url(r'^api/v1/external/newrelic$', 'zerver.views.webhooks.newrelic.api_newrelic_webhook'),
|
||||
url(r'^api/v1/external/pagerduty$', 'zerver.views.webhooks.pagerduty.api_pagerduty_webhook'),
|
||||
url(r'^api/v1/external/pingdom$', 'zerver.views.webhooks.pingdom.api_pingdom_webhook'),
|
||||
url(r'^api/v1/external/pivotal$', 'zerver.views.webhooks.pivotal.api_pivotal_webhook'),
|
||||
url(r'^api/v1/external/stash$', 'zerver.views.webhooks.stash.api_stash_webhook'),
|
||||
url(r'^api/v1/external/taiga$', 'zerver.views.webhooks.taiga.api_taiga_webhook'),
|
||||
url(r'^api/v1/external/teamcity$', 'zerver.views.webhooks.teamcity.api_teamcity_webhook'),
|
||||
url(r'^api/v1/external/transifex$', 'zerver.views.webhooks.transifex.api_transifex_webhook'),
|
||||
url(r'^api/v1/external/travis$', 'zerver.views.webhooks.travis.api_travis_webhook'),
|
||||
url(r'^api/v1/external/updown$', 'zerver.views.webhooks.updown.api_updown_webhook'),
|
||||
url(r'^api/v1/external/yo$', 'zerver.views.webhooks.yo.api_yo_app_webhook'),
|
||||
url(r'^api/v1/external/zendesk$', 'zerver.views.webhooks.zendesk.api_zendesk_webhook'),
|
||||
|
||||
url(r'^user_uploads/(?P<realm_id_str>(\d*|unk))/(?P<filename>.*)', 'upload.get_uploaded_file'),
|
||||
)
|
||||
url(r'^user_uploads/(?P<realm_id_str>(\d*|unk))/(?P<filename>.*)', 'zerver.views.upload.get_uploaded_file'),
|
||||
]
|
||||
|
||||
# JSON format views used by the redesigned API, accept basic auth username:password.
|
||||
v1_api_and_json_patterns = patterns('zerver.views',
|
||||
|
|
@ -288,18 +288,18 @@ for app_name in settings.EXTRA_INSTALLED_APPS:
|
|||
)
|
||||
i18n_urls += import_string("{}.urls.i18n_urlpatterns".format(app_name))
|
||||
|
||||
urlpatterns += patterns('zerver.tornadoviews',
|
||||
urlpatterns += [
|
||||
# Tornado views
|
||||
url(r'^json/get_events$', 'json_get_events'),
|
||||
url(r'^json/get_events$', 'zerver.tornadoviews.json_get_events'),
|
||||
# Used internally for communication between Django and Tornado processes
|
||||
url(r'^notify_tornado$', 'notify'),
|
||||
)
|
||||
url(r'^notify_tornado$', 'zerver.tornadoviews.notify'),
|
||||
]
|
||||
|
||||
# Include the dual-use patterns twice
|
||||
urlpatterns += patterns('',
|
||||
urlpatterns += [
|
||||
url(r'^api/v1/', include(v1_api_and_json_patterns)),
|
||||
url(r'^json/', include(v1_api_and_json_patterns)),
|
||||
)
|
||||
]
|
||||
|
||||
|
||||
if settings.DEVELOPMENT:
|
||||
|
|
@ -307,9 +307,8 @@ if settings.DEVELOPMENT:
|
|||
static_root = os.path.join(settings.DEPLOY_ROOT,
|
||||
'prod-static/serve' if use_prod_static else 'static')
|
||||
|
||||
urlpatterns += patterns('',
|
||||
url(r'^static/(?P<path>.*)$', 'django.views.static.serve',
|
||||
{'document_root': static_root}))
|
||||
urlpatterns += [url(r'^static/(?P<path>.*)$', 'django.views.static.serve',
|
||||
{'document_root': static_root})]
|
||||
|
||||
# The sequence is important; if i18n urls don't come first then
|
||||
# reverse url mapping points to i18n urls which causes the frontend
|
||||
|
|
|
|||
Loading…
Reference in New Issue