Mercurial > hg > bitsyblog
comparison bitsyblog/bitsyblog.py @ 98:9e1e736958a2
deprecate
author | Jeff Hammel <jhammel@mozilla.com> |
---|---|
date | Sat, 30 Nov 2013 17:44:41 -0800 |
parents | a20fd4fef727 |
children | f2780e1418bb |
comparison
equal
deleted
inserted
replaced
97:a20fd4fef727 | 98:9e1e736958a2 |
---|---|
129 | 129 |
130 def __call__(self, environ, start_response): | 130 def __call__(self, environ, start_response): |
131 request = Request(environ) | 131 request = Request(environ) |
132 | 132 |
133 # genshi data dictionary | 133 # genshi data dictionary |
134 request.environ['data'] = { 'site_name': self.site_name, | 134 request.environ['data'] = {'site_name': self.site_name, |
135 'request': request, | 135 'request': request, |
136 'link': self.link, | 136 'link': self.link, |
137 'logo': self.logo(request), | 137 'logo': self.logo(request), |
138 'header': self.header, | 138 'header': self.header, |
139 'user_url': self.user_url, | 139 'user_url': self.user_url, |
140 'permalink': self.permalink } | 140 'permalink': self.permalink } |
141 | 141 |
142 res = self.response_functions.get(request.method, self.method_not_allowed)(request) | 142 res = self.response_functions.get(request.method, self.method_not_allowed)(request) |
143 return res(environ, start_response) | 143 return res(environ, start_response) |
144 | 144 |
145 def get_response(self, text, content_type='text/html'): | 145 ## GET |
146 # XXX to deprecate | |
147 res = Response(content_type=content_type, body=text) | |
148 return res | |
149 | 146 |
150 def logo(self, request): | 147 def logo(self, request): |
151 """link to the logo""" | 148 """link to the logo""" |
152 _logo = 'bitsyblog.png' # TODO: should go to self.logo | 149 _logo = 'bitsyblog.png' # TODO: should go to self.logo |
153 logo = os.path.join(self.file_dir, _logo) | 150 logo = os.path.join(self.file_dir, _logo) |
284 | 281 |
285 ### user space | 282 ### user space |
286 user, path = self.userpath(request) | 283 user, path = self.userpath(request) |
287 return self.get_user_space(user, path, request) | 284 return self.get_user_space(user, path, request) |
288 | 285 |
286 ## POST | |
287 | |
289 def post(self, request): | 288 def post(self, request): |
290 """ | 289 """ |
291 write a blog entry and other POST requests | 290 write a blog entry and other POST requests |
292 """ | 291 """ |
293 | 292 |
312 settings['CSS file'] = request.POST.get('CSS file') | 311 settings['CSS file'] = request.POST.get('CSS file') |
313 settings['Friends'] = ', '.join(request.POST.getall('Friends')) | 312 settings['Friends'] = ', '.join(request.POST.getall('Friends')) |
314 | 313 |
315 errors = self.users.write_settings(user, **settings) | 314 errors = self.users.write_settings(user, **settings) |
316 if errors: # re-display form with errors | 315 if errors: # re-display form with errors |
317 return self.get_response(self.preferences(request, user, errors)) | 316 return Response(content_type='text/html', |
318 | 317 body=self.preferences(request, user, errors)) |
319 return self.get_response(self.preferences(request, user, message='Changes saved')) | 318 |
319 return Response(content_type='text/html', | |
320 body=self.preferences(request, user, message='Changes saved')) | |
320 elif len(path) == 1 and self.isentry(path[0]): | 321 elif len(path) == 1 and self.isentry(path[0]): |
321 entry = self.blog.entry(user, path[0], roles['author']) | 322 entry = self.blog.entry(user, path[0], roles['author']) |
322 if entry is None: | 323 if entry is None: |
323 return exc.HTTPNotFound("Blog entry %s not found %s" % path[0]) | 324 return exc.HTTPNotFound("Blog entry %s not found %s" % path[0]) |
324 privacy = request.POST.get('privacy') | 325 privacy = request.POST.get('privacy') |