change cartoview apps url & title to cv-apps to avoid conflict with g…

…eonode apps
cartologic · May 24, 2021 · 241310e · 241310e
1 parent fad2327
commit 241310e
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/cartoview/app_manager/templates/app_manager/app_instance_list.html b/cartoview/app_manager/templates/app_manager/app_instance_list.html
@@ -14,7 +14,7 @@
         {% if not user.is_authenticated and request.GET.app__title %}
         {% verbatim %}
         <a class="btn btn-primary pull-right"
-           href="/account/login?next=/apps/{{ app_name }}/new">
+           href="/account/login?next=/cv-apps/{{ app_name }}/new">
             {% endverbatim %}
             {% trans "Create New" %}
             {% verbatim %}
@@ -23,7 +23,7 @@
     {% else %}
         {% if request.GET.app__title %}
             {% verbatim %}
-            <a class="btn btn-primary pull-right" ng-href="/apps/{{ app_name }}/new/">Create
+            <a class="btn btn-primary pull-right" ng-href="/cv-apps/{{ app_name }}/new/">Create
                 New</a>
             {% endverbatim %}
         {% endif %}

diff --git a/cartoview/app_manager/tests/test_views.py b/cartoview/app_manager/tests/test_views.py
@@ -10,7 +10,7 @@ def setUp(self):
         call_command("load_current_apps")
 
     def test_view_url_exists_at_desired_location(self):
-        resp = self.client.get('/apps/')
+        resp = self.client.get('/cv-apps/')
         self.assertEqual(resp.status_code, 200)
 
     def test_view_url_accessible_by_name(self):
@@ -38,7 +38,7 @@ def setUp(self):
         self.client.login(username=self.username, password=self.password)
 
     def test_view_url_exists_at_desired_location(self):
-        resp = self.client.get("/apps/manage/")
+        resp = self.client.get("/cv-apps/manage/")
         self.assertEqual(resp.status_code, 200)
 
     def test_view_url_accessible_by_name(self):

diff --git a/cartoview/locale/ar/LC_MESSAGES/django.po b/cartoview/locale/ar/LC_MESSAGES/django.po
@@ -63,7 +63,7 @@ msgstr "مسح"
 #: templates/cartoview/geonode_base.html:12
 #: templates/cartoview/geonode_base.html:33
 #: templates/cartoview/site_header.html:28 templates/geonode_base.html:8
-msgid "Apps"
+msgid "CV Apps"
 msgstr "التطبيقات"
 
 #: app_manager/templates/app_manager/app_instance_list.html:5

diff --git a/cartoview/templates/cartoview/base.html b/cartoview/templates/cartoview/base.html
@@ -5,7 +5,7 @@
     {{ block.super }}
 {% endblock %}
 {% block tabs %}
-<li><a href="{% url 'app_manager_base_url' %}">{% trans "Apps" %}</a></li> 
+<li><a href="{% url 'app_manager_base_url' %}">{% trans "CV Apps" %}</a></li>
 {{block.super}}
 {% endblock %}
 {% block footer %}

diff --git a/cartoview/urls.py b/cartoview/urls.py
@@ -29,6 +29,6 @@
         name='cartoview.update_extent'),
     url(r'^check-version/$', check_version, name='check_version'),
     url(r'', include(api.urls)),
-    url(r'^apps/', include('cartoview.app_manager.urls')),
+    url(r'^cv-apps/', include('cartoview.app_manager.urls'), name='cv_apps'),
 ]
 urlpatterns += geonode_urls