Skip to content

Commit f33eab6

Browse files
committed
Install custom wiki pages before default pages, as we refuse to overwrite an existing page.
- Legacy-Id: 12174
1 parent 0ec2853 commit f33eab6

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

ietf/utils/management/commands/create_group_wikis.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ def add_custom_wiki_pages(self, group, env):
122122
_, name = os.path.split(templ)
123123
text = render_to_string(templ, {"group": group})
124124
self.note(" Adding page %s" % name)
125+
self.add_wiki_page(env, name, text)
125126

126127
def sync_default_repository(self, group, env):
127128
repository = env.get_repository('')
@@ -143,7 +144,6 @@ def create_trac(self, group):
143144
# Try to creat ethe environment, remove unwanted defaults, and add
144145
# custom pages and settings.
145146
try:
146-
debug.show('options')
147147
env = Environment(group.trac_dir, create=True, options=options)
148148
self.remove_demo_components(group, env)
149149
self.remove_demo_milestones(group, env)
@@ -153,8 +153,8 @@ def create_trac(self, group):
153153
self.symlink_to_master_assets(group, env)
154154
if group.type_id == 'wg':
155155
self.add_wg_draft_states(group, env)
156-
self.add_default_wiki_pages(group, env)
157156
self.add_custom_wiki_pages(group, env)
157+
self.add_default_wiki_pages(group, env)
158158
self.sync_default_repository(group, env)
159159
# Components (i.e., drafts) will be handled during components
160160
# update later
@@ -248,7 +248,7 @@ def handle(self, *filenames, **options):
248248
groups = Group.objects.filter(
249249
type__slug__in=['wg','rg','area'],
250250
state__slug='active'
251-
)
251+
).order_by('acronym')
252252

253253
for group in groups:
254254
try:

0 commit comments

Comments
 (0)