Commit fa1287f99788bfaa526cbbc8b3433c6ef9dcbba1
1 parent
cb384ef4
Exists in
master
and in
3 other branches
Added default error message and limit of activity
Signed-off-by: Macartur Sousa <macartur.sc@gmail.com>
Showing
2 changed files
with
11 additions
and
4 deletions
Show diff stats
colab_spb/templates/feed_repository.html
| @@ -5,17 +5,21 @@ | @@ -5,17 +5,21 @@ | ||
| 5 | <script type='text/javascript' src='/static/spb/js/jquery.timeago.js' ></script> | 5 | <script type='text/javascript' src='/static/spb/js/jquery.timeago.js' ></script> |
| 6 | </head> | 6 | </head> |
| 7 | 7 | ||
| 8 | -<div id='feed_content' > </div> | 8 | +<div id='feed_content' ></div> |
| 9 | 9 | ||
| 10 | <script type="text/javascript"> | 10 | <script type="text/javascript"> |
| 11 | $.ajax({ type: "GET", | 11 | $.ajax({ type: "GET", |
| 12 | url: '{{ url }}', | 12 | url: '{{ url }}', |
| 13 | - data: "limit=20&offset=0", | 13 | + data: "limit={{limit}}&offset=0", |
| 14 | complete: function(msg,e) { | 14 | complete: function(msg,e) { |
| 15 | - return e | 15 | + if (msg !== 'success') |
| 16 | + $('#feed_content').html( | ||
| 17 | + "Não foi encontrado repositório associado a esta comunidade,"+ | ||
| 18 | + " para mais detalhes contacte o administrador.") | ||
| 19 | + return e; | ||
| 16 | }, | 20 | }, |
| 17 | success: function(e) { | 21 | success: function(e) { |
| 18 | - $('#feed_content').html(e.html) | 22 | + $('#feed_content').html(e.html); |
| 19 | }, | 23 | }, |
| 20 | dataType: "json" | 24 | dataType: "json" |
| 21 | }) | 25 | }) |
colab_spb/views.py
| @@ -52,6 +52,7 @@ def get_list(request): | @@ -52,6 +52,7 @@ def get_list(request): | ||
| 52 | def feed_repository(request): | 52 | def feed_repository(request): |
| 53 | group = request.GET.get('group',"") | 53 | group = request.GET.get('group',"") |
| 54 | project = request.GET.get('project',"") | 54 | project = request.GET.get('project',"") |
| 55 | + limit = request.GET.get("limit",20) | ||
| 55 | 56 | ||
| 56 | context = {} | 57 | context = {} |
| 57 | context['url']= '/gitlab' | 58 | context['url']= '/gitlab' |
| @@ -60,5 +61,7 @@ def feed_repository(request): | @@ -60,5 +61,7 @@ def feed_repository(request): | ||
| 60 | context['url'] += "/"+group | 61 | context['url'] += "/"+group |
| 61 | if project : | 62 | if project : |
| 62 | context['url'] += "/"+project | 63 | context['url'] += "/"+project |
| 64 | + if limit: | ||
| 65 | + context['limit'] = limit | ||
| 63 | 66 | ||
| 64 | return render(request,"feed_repository.html",context) | 67 | return render(request,"feed_repository.html",context) |