Download as
Browse Code »

Commit fa1287f99788bfaa526cbbc8b3433c6ef9dcbba1

Authored by Macartur Sousa
1 parent cb384ef4
Exists in master and in 79 other branches add_sisp_to_chef, add_super_archives_plugin, api_for_colab, automates_core_packing, backup_not_prod, changes_in_buttons_on_content_panel, colab_automated_login, colab_spb_plugin_recipe, colab_widgets_settings, design_validation, dev_env_minimal, disable_email_dev, fix_breadcrumbs_position, fix_categories_software_link, fix_edit_institution, fix_edit_software_with_another_license, fix_get_license_info, fix_gitlab_assets_permission, fix_list_style_inside_article, fix_list_style_on_folder_elements, fix_members_pagination, fix_merge_request_url, fix_models_translations, fix_no_license, fix_software_api, fix_software_block_migration, fix_software_communities_translations, fix_software_communities_unit_test, fix_style_create_institution_admin_panel, fix_superarchives_imports, fix_sym_links_noosfero, focus_search_field_theme, gov-user-refactoring, gov-user-refactoring-rails4, header_fix, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, lxc_settings, margin_fix, mezuro_cookbook, prezento, refactor_download_block, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_broken_theme, remove_secondary_email_from_user, remove_sisp_buttons, removing_super_archives_email, review_message, scope2method, signals_user_noosfero, sisp_catalog_header, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_communities_html_refactor, software_infos_api, spb_minimal_env, spb_to_rails4, spec_refactor, stable-4.1, stable-4.2, stable-4.x, temp_soft_comm_refactoring, theme_header, theme_javascript_refactory, thread_dropdown, thread_page, update_search_by_categories, update_software_api, update_softwares_boxes

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
  Diff comments   View file @fa1287f
... ... @@ -5,17 +5,21 @@
5 5 <script type='text/javascript' src='/static/spb/js/jquery.timeago.js' ></script>
6 6 </head>
7 7  
8   -<div id='feed_content' > </div>
  8 +<div id='feed_content' ></div>
9 9  
10 10 <script type="text/javascript">
11 11 $.ajax({ type: "GET",
12 12 url: '{{ url }}',
13   - data: "limit=20&offset=0",
  13 + data: "limit={{limit}}&offset=0",
14 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 21 success: function(e) {
18   - $('#feed_content').html(e.html)
  22 + $('#feed_content').html(e.html);
19 23 },
20 24 dataType: "json"
21 25 })
... ...
colab_spb/views.py
  Diff comments   View file @fa1287f
... ... @@ -52,6 +52,7 @@ def get_list(request):
52 52 def feed_repository(request):
53 53 group = request.GET.get('group',"")
54 54 project = request.GET.get('project',"")
  55 + limit = request.GET.get("limit",20)
55 56  
56 57 context = {}
57 58 context['url']= '/gitlab'
... ... @@ -60,5 +61,7 @@ def feed_repository(request):
60 61 context['url'] += "/"+group
61 62 if project :
62 63 context['url'] += "/"+project
  64 + if limit:
  65 + context['limit'] = limit
63 66  
64 67 return render(request,"feed_repository.html",context)
... ...