Ubuntu Apps Directory

Merge lp:~jonas-drange/ubuntu-webcatalog/tos-sane-defaults into lp:ubuntu-webcatalog

Proposed by Jonas G. Drange on 2013-10-10

Status:	Merged
Approved by:	Jonas G. Drange on 2013-10-10
Approved revision:	192
Merged at revision:	192
Proposed branch:	lp:~jonas-drange/ubuntu-webcatalog/tos-sane-defaults
Merge into:	lp:ubuntu-webcatalog
Diff against target:	29 lines (+4/-4) 2 files modified django_project/config/main.cfg (+0/-2) src/webcatalog/schema.py (+4/-2)
To merge this branch:	bzr merge lp:~jonas-drange/ubuntu-webcatalog/tos-sane-defaults
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Michael Nelson (community)		2013-10-10	Approve on 2013-10-10
Review via email: mp+190313@code.launchpad.net

moving u1 terms urls from config into schema as sane defaults

moving u1 terms urls from config into schema as sane defaults

Revision history for this message

Michael Nelson (michael.nelson) on 2013-10-10:

review: Approve

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

People subscribed via source and target branches

to all changes:

1	=== modified file 'django_project/config/main.cfg'
2	--- django_project/config/main.cfg 2013-09-04 20:28:43 +0000
3	+++ django_project/config/main.cfg 2013-10-10 08:54:21 +0000
4	@@ -93,8 +93,6 @@
5	convoy_root = ./src/webcatalog/static/
6	ubuntu_series_for_versions = series_for_versions
7	webapp_log_path = ./tmp/webapp.log
8	-ubuntuone_tos_url = http://one.ubuntu.com/terms/
9	-ubuntuone_tos_url_embedded = http://one.ubuntu.com/terms/embedded
10
11	[series_for_versions]
12	10.04 = lucid
13
14	=== modified file 'src/webcatalog/schema.py'
15	--- src/webcatalog/schema.py 2013-09-04 20:28:43 +0000
16	+++ src/webcatalog/schema.py 2013-10-10 08:54:21 +0000
17	@@ -79,8 +79,10 @@
18	default='./tmp/webapp.log')
19	log_format = schema.StringOption(
20	default='%(asctime)s - %(name)s - %(levelname)s - %(message)s')
21	- ubuntuone_tos_url = schema.StringOption()
22	- ubuntuone_tos_url_embedded = schema.StringOption()
23	+ ubuntuone_tos_url = schema.StringOption(
24	+ default='http://one.ubuntu.com/terms/')
25	+ ubuntuone_tos_url_embedded = schema.StringOption(
26	+ default='http://one.ubuntu.com/terms/embedded/')
27
28	class google(schema.Section):
29	google_analytics_id = schema.StringOption()