Download as
Browse Code »

Commit dab880dd83897754b1fc6b7589cb495e6990ee90

Authored by Sergio Oliveira
1 parent 65f681cd
Exists in master and in 39 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, check-port, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_cache_count_spb, fix_header, fixed_gitlab_import, go_to_profile_panel, header_footer, layout-fix, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, spb-release/3.0, split_screen, stable, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

Fixing api name and links

Showing 2 changed files with 5 additions and 6 deletions   Show diff stats
src/api/urls.py
  Diff comments   View file @dab880d
@@ -9,7 +9,7 @@ from .models import (UserResource, EmailAddressResource, MessageResource, @@ -9,7 +9,7 @@ from .models import (UserResource, EmailAddressResource, MessageResource,
9 from .views import VoteView 9 from .views import VoteView
10 10
11 11
12 -api = Api(api_name='colab') 12 +api = Api(api_name='v1')
13 api.register(UserResource()) 13 api.register(UserResource())
14 api.register(EmailAddressResource()) 14 api.register(EmailAddressResource())
15 api.register(MessageResource()) 15 api.register(MessageResource())
src/templates/open-data.html
  Diff comments   View file @dab880d
@@ -4,14 +4,14 @@ @@ -4,14 +4,14 @@
4 {% block main-content %} 4 {% block main-content %}
5 <div class="col-lg-12"> 5 <div class="col-lg-12">
6 <h2>{% trans "OpenData - Communities Interlegis" %}</h2> 6 <h2>{% trans "OpenData - Communities Interlegis" %}</h2>
7 - <p>{% trans "If you are interested in integrating your system with the Colab environment and requires no other data provided by this API, please contact us via the ticketing system (you must be registered in order to create a ticket)." %}</p> 7 + <p>{% trans "If you are interested in any other data that is not provided by this API, please contact us via the ticketing system (you must be registered in order to create a ticket)." %}</p>
8 8
9 <h3>{% trans "Retrieving data via API" %}</h3> 9 <h3>{% trans "Retrieving data via API" %}</h3>
10 - <p>{% trans "Colab API works through an HTTP/REST always returning JSON objects." %}</p> 10 + <p>{% trans "Colab API works through HTTP/REST and always returning JSON objects." %}</p>
11 <p> 11 <p>
12 {% trans "The base API URL is" %}: 12 {% trans "The base API URL is" %}:
13 - {% with "/api/colab/" as BASE_API_URL %}  
14 - <a href="{{ BASE_API_URL }}">http://colab.interlegis.leg.br{{ BASE_API_URL }}</a> 13 + {% url 'api_v1_top_level' api_name='v1' as BASE_API_URL %}
  14 + <a href="{{ BASE_API_URL }}">{{ BASE_API_URL }}</a>
15 </p> 15 </p>
16 16
17 <ul class="list-unstyled"> 17 <ul class="list-unstyled">
@@ -43,7 +43,6 @@ @@ -43,7 +43,6 @@
43 <strong><a href="{{ BASE_API_URL }}wiki/">wiki</a></strong>: 43 <strong><a href="{{ BASE_API_URL }}wiki/">wiki</a></strong>:
44 {% trans "Retrieve wikis with author, created, modified, modified_by, name and wiki_text" %} 44 {% trans "Retrieve wikis with author, created, modified, modified_by, name and wiki_text" %}
45 </li> 45 </li>
46 - {% endwith %}  
47 </ul> 46 </ul>
48 </li> 47 </li>
49 </ul> 48 </ul>