Merge branch 'fix-example-project' into 'master'

Fork: 0

kalle / postorius

Browse code Merge branch 'fix-example-project' into 'master' Fix example project * the requirements needed an update so the git version of mailmanclient is used. * the "home page" url didn't work due to a wrong import See merge request !150 master
commit 9d06a737c4629c691606fd05f70202daed415139 2 parents 2fd81c8 + 07be321 Aurélien Bompard authored on 30 May 2016

Patch

Unified Split

Showing 3 changed files

                Ignore Space
               Show notes
              View
            
          
          10 ■■■■■
          example_project/README.rst
 You should then be able to open your browser on http://127.0.0.1:8000 and see
postorius running.
 
 
If you are using the example_application for development, you have to install
postorius and mailmanclient another way. Be sure to have the virtualenv
activated and from the base directory of the respective repositories
you should run:
 
::
 
    $ python setup.py develop
 You should then be able to open your browser on http://127.0.0.1:8000 and see
 postorius running.
+If you are using the example_application for development, you have to install
+postorius and mailmanclient another way. Be sure to have the virtualenv
+activated and from the base directory of the respective repositories
+you should run:
+::
+    $ python setup.py develop

                Ignore Space
               Show notes
              View
            
          
          4 ■■■■■
          example_project/requirements.txt
               Django>1.8,<1.10
# before a release replace it with the version about to be released
../
git+https://gitlab.com/mailman/mailmanclient.git
git+https://gitlab.com/mailman/postorius.git
 Django>1.8,<1.10
+# before a release replace it with the version about to be released
+../
+git+https://gitlab.com/mailman/mailmanclient.git
+git+https://gitlab.com/mailman/postorius.git

                Ignore Space
               Show notes
              View
            
          
          4 ■■■■■
          example_project/urls.py
 from django.contrib import admin
admin.autodiscover()
 
from postorius import views
from postorius.views import list as list_views
 
urlpatterns = [
    url(r'^admin/', include(admin.site.urls)),
    url('', include('django_browserid.urls')),
    url(r'^$', views.list.list_index),
    url(r'^$', list_views.list_index),
    url(r'^postorius/', include('postorius.urls')),
]
 from django.contrib import admin
 admin.autodiscover()
+from postorius import views
+from postorius.views import list as list_views
 urlpatterns = [
     url(r'^admin/', include(admin.site.urls)),
     url('', include('django_browserid.urls')),
+    url(r'^$', views.list.list_index),
+    url(r'^$', list_views.list_index),
     url(r'^postorius/', include('postorius.urls')),
 ]

Show line notes below