Merge lp:~crodjer/postorius/postorius into lp:postorius

Proposed by Rohan Jain
Status: Merged
Merged at revision: 64
Proposed branch: lp:~crodjer/postorius/postorius
Merge into: lp:postorius
Diff against target: 29 lines (+8/-4)
1 file modified
dev_setup/settings.py (+8/-4)
To merge this branch: bzr merge lp:~crodjer/postorius/postorius
Reviewer Review Type Date Requested Status
Florian Fuchs Approve
Review via email: mp+99881@code.launchpad.net

Description of the change

These let the Web UI work with django 1.4 by handling changes which were there in 1.2 but are dropped from 1.4. They also do not break anything and should work fine with django 1.2/1.3

To post a comment you must log in.
lp:~crodjer/postorius/postorius updated
66. By Rohan Jain

Restore the accidently changed filename

Revision history for this message
Florian Fuchs (flo-fuchs) wrote :

Hello Rohan,

thank you for this fix! I just merged it into the trunk. Only thing: I renamed mutest.db to mmtest.db in dev_setup/settings.py again.

Florian

review: Approve
Revision history for this message
Rohan Jain (crodjer) wrote :

Okay. I changed it to mutest.db because someone by the nick wacky asked
over
the IRC

--
Rohan

On Thursday, April 5, 2012, Florian Fuchs wrote:

> Review: Approve
>
> Hello Rohan,
>
> thank you for this fix! I just merged it into the trunk. Only thing: I
> renamed mutest.db to mmtest.db in dev_setup/settings.py again.
>
> Florian
>
> --
> https://code.launchpad.net/~crodjer/postorius/postorius/+merge/99881
> You are the owner of lp:~crodjer/postorius/postorius.
>

--

Rohan Jain

Revision history for this message
Richard Wackerbarth (wacky) wrote :

On Apr 4, 2012, at 9:40 PM, Rohan Jain wrote:

> Okay. I changed it to mutest.db because someone by the nick wacky asked
> over the IRC

First, that was a typo in my IRC message.
Second, I did not request that you change the file name. I ASK why you changed the definition (from Florian's computed path).
You never responded.

Revision history for this message
Rohan Jain (crodjer) wrote :

I am sorry about not responding right away. I was away from the
computer then. I did respond much later though. I'll blame this to the
time zones.

--Rohan

On 04:01 -0000 / 5 Apr, Richard Wackerbarth wrote:
> On Apr 4, 2012, at 9:40 PM, Rohan Jain wrote:
>
> > Okay. I changed it to mutest.db because someone by the nick wacky asked
> > over the IRC
>
> First, that was a typo in my IRC message.
> Second, I did not request that you change the file name. I ASK why you changed the definition (from Florian's computed path).
> You never responded.
> --
> https://code.launchpad.net/~crodjer/postorius/postorius/+merge/99881
> You are the owner of lp:~crodjer/postorius/postorius.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'dev_setup/settings.py'
2--- dev_setup/settings.py 2012-03-23 23:22:16 +0000
3+++ dev_setup/settings.py 2012-04-04 02:15:29 +0000
4@@ -46,8 +46,12 @@
5
6 MANAGERS = ADMINS
7
8-DATABASE_ENGINE = 'sqlite3'
9-DATABASE_NAME = os.path.join(PROJECT_PATH, 'mmtest.db')
10+DATABASES = {
11+ 'default': {
12+ 'ENGINE': 'django.db.backends.sqlite3',
13+ 'NAME': 'mutest.db'
14+ }
15+}
16
17 # Local time zone for this installation. Choices can be found here:
18 # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
19@@ -85,8 +89,8 @@
20
21 # List of callables that know how to import templates from various sources.
22 TEMPLATE_LOADERS = (
23- 'django.template.loaders.filesystem.load_template_source',
24- 'django.template.loaders.app_directories.load_template_source',
25+ 'django.template.loaders.filesystem.Loader',
26+ 'django.template.loaders.app_directories.Loader',
27 )
28
29 AUTHENTICATION_BACKENDS = (

Subscribers

People subscribed via source and target branches