From: Lukasz Rekucki Date: Wed, 19 Aug 2009 15:10:05 +0000 (+0200) Subject: Django dopisuje tickety powiÄ…zane z danym plikiem XML. Closes #25. X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/75669838ac1f6c847aa2c343fee17ea642d52462?ds=sidebyside;hp=--cc Django dopisuje tickety powiÄ…zane z danym plikiem XML. Closes #25. --- 75669838ac1f6c847aa2c343fee17ea642d52462 diff --git a/apps/explorer/views.py b/apps/explorer/views.py index ac83c4ef..8d80d029 100644 --- a/apps/explorer/views.py +++ b/apps/explorer/views.py @@ -15,15 +15,18 @@ def file_list(request): 'objects': repo.all_files(), }) - def file_xml(request, path): if request.method == 'POST': form = forms.BookForm(request.POST) if form.is_valid(): repo.add_file(path, form.cleaned_data['text']) - # issues = _get_issues_for_file(path) - # commit_message = _add_references(form.cleaned_data['commit_message'], issued) - repo.commit(message=form.cleaned_data['commit_message'], user=form.cleaned_data['user']) + + # add references to comment + issues = _get_issues_for_file(path) + commit_message = _add_references(form.cleaned_data['commit_message'], issues) + print 'Commiting with: ' + commit_message + + repo.commit(message=commit_message, user=form.cleaned_data['user']) return HttpResponseRedirect(request.get_full_path()) else: form = forms.BookForm() @@ -49,18 +52,19 @@ def folder_images(request, folder): }) def _add_references(message, issues): - for issue in issues: - message += " refs #%d " % issue.id - return message + return message + " - " + ", ".join(map(lambda issue: "Refs #%d" % issue['id'], issues)) def _get_issues_for_file(path): if not path.endswith('.xml'): raise ValueError('Path must end with .xml') - book_id = path[:-3] - uf = urllib2.urlopen(settings.REDMINE_URL + 'publications/%s/issues' % book_id) + book_id = path[:-4] + uf = None try: + uf = urllib2.urlopen(settings.REDMINE_URL + 'publications/issues/%s.json' % book_id) return json.loads(uf.read()) + except urllib2.HTTPError: + return [] finally: - uf.close() + if uf: uf.close()