Commit 8b95a69d9641bb5545fef54ebab169663529f215

Authored by Tássia Camões Araújo
2 parents c490e149 60034491
Exists in master and in 1 other branch add_vagrant

Merge branch 'master' of https://github.com/tassia/AppRecommender

Conflicts:
	src/config.py
src/web/server.py
@@ -251,9 +251,7 @@ class AppRecommender: @@ -251,9 +251,7 @@ class AppRecommender:
251 return render.survey(recommendation, pkg_details, 251 return render.survey(recommendation, pkg_details,
252 FeedbackForm(request.selected_strategies)) 252 FeedbackForm(request.selected_strategies))
253 else: 253 else:
254 - return render.apprec(recommendation, pkg_summaries,  
255 - FeedbackForm(request.selected_strategies),  
256 - request) 254 + return render.apprec(recommendation, pkg_summaries, request)
257 255
258 def _recommends(self,request): 256 def _recommends(self,request):
259 user = User(dict.fromkeys(request.pkgs_list,1),request.user_id) 257 user = User(dict.fromkeys(request.pkgs_list,1),request.user_id)
src/web/templates/apprec.html
1 -$def with (recommends, pkg_summaries, form, request) 1 +$def with (recommends, pkg_summaries, request)
2 $var title: Feedback 2 $var title: Feedback
3 $var mod = 'feedback'; 3 $var mod = 'feedback';
4 $var cssfiles: static/css/apprec.css static/css/facebox.css static/css/voting.css 4 $var cssfiles: static/css/apprec.css static/css/facebox.css static/css/voting.css