From 2ef503465c2da54b2d462b51dcf1196d327d839d Mon Sep 17 00:00:00 2001
From: Keigo Noha <knoha@redhat.com>
Date: Thu, 7 Feb 2019 12:23:00 +0900
Subject: [PATCH] Fixing a link in templates of CG and CG snapshots

Commit f85e0ffa9135a60ff203651ce7bfd5c0ca36ceec moved Consistency Group
out of Volumes panel.
During the work, some template files were not modified with new location.
A lack of the modification caused that user cannot create a snapshot in
Consistency Group via Horizon.
This patch fixes the location of the template and it prevents the
traceback.

Change-Id: Ic8a569cf0781e816e6da6f4423c5cd3bcc9e2eb7
Closes-Bug: #1815165
---
 .../project/cg_snapshots/templates/cg_snapshots/create.html     | 2 +-
 .../project/cg_snapshots/templates/cg_snapshots/update.html     | 2 +-
 .../project/cgroups/templates/cgroups/_create_snapshot.html     | 2 +-
 .../project/cgroups/templates/cgroups/clone_cgroup.html         | 2 +-
 .../project/cgroups/templates/cgroups/create_snapshot.html      | 2 +-
 .../dashboards/project/cgroups/templates/cgroups/delete.html    | 2 +-
 .../project/cgroups/templates/cgroups/remove_vols.html          | 2 +-
 .../dashboards/project/cgroups/templates/cgroups/update.html    | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/openstack_dashboard/dashboards/project/cg_snapshots/templates/cg_snapshots/create.html b/openstack_dashboard/dashboards/project/cg_snapshots/templates/cg_snapshots/create.html
index 7df3d94c17..3666d1f506 100644
--- a/openstack_dashboard/dashboards/project/cg_snapshots/templates/cg_snapshots/create.html
+++ b/openstack_dashboard/dashboards/project/cg_snapshots/templates/cg_snapshots/create.html
@@ -3,5 +3,5 @@
 {% block title %}{{ page_title }}{% endblock %}
 
 {% block main %}
-    {% include 'project/volumes/cg_snapshots/_create.html' %}
+    {% include 'project/cg_snapshots/_create.html' %}
 {% endblock %}
diff --git a/openstack_dashboard/dashboards/project/cg_snapshots/templates/cg_snapshots/update.html b/openstack_dashboard/dashboards/project/cg_snapshots/templates/cg_snapshots/update.html
index 33b227b329..0b4ba8ba49 100644
--- a/openstack_dashboard/dashboards/project/cg_snapshots/templates/cg_snapshots/update.html
+++ b/openstack_dashboard/dashboards/project/cg_snapshots/templates/cg_snapshots/update.html
@@ -3,5 +3,5 @@
 {% block title %}{{ page_title }}{% endblock %}
 
 {% block main %}
-    {% include 'project/volumes/cg_snapshots/_update.html' %}
+    {% include 'project/cg_snapshots/_update.html' %}
 {% endblock %}
diff --git a/openstack_dashboard/dashboards/project/cgroups/templates/cgroups/_create_snapshot.html b/openstack_dashboard/dashboards/project/cgroups/templates/cgroups/_create_snapshot.html
index b401961444..e98e55a7fd 100644
--- a/openstack_dashboard/dashboards/project/cgroups/templates/cgroups/_create_snapshot.html
+++ b/openstack_dashboard/dashboards/project/cgroups/templates/cgroups/_create_snapshot.html
@@ -5,6 +5,6 @@
   <div class="quota-dynamic">
     <p>{% blocktrans %}Create a snapshot for each volume contained in the Consistency Group.{% endblocktrans %}</p>
     <p>{% blocktrans %}Snapshots can only be created for Consistency Groups that contain volumes.{% endblocktrans %}</p>
-    {% include "project/volumes/cgroups/_snapshot_limits.html" with usages=usages snapshot_quota=True %}
+    {% include "project/cgroups/_snapshot_limits.html" with usages=usages snapshot_quota=True %}
   </div>
 {% endblock %}
diff --git a/openstack_dashboard/dashboards/project/cgroups/templates/cgroups/clone_cgroup.html b/openstack_dashboard/dashboards/project/cgroups/templates/cgroups/clone_cgroup.html
index 3cb746da45..8592b14bc8 100644
--- a/openstack_dashboard/dashboards/project/cgroups/templates/cgroups/clone_cgroup.html
+++ b/openstack_dashboard/dashboards/project/cgroups/templates/cgroups/clone_cgroup.html
@@ -3,5 +3,5 @@
 {% block title %}{{ page_title }}{% endblock %}
 
 {% block main %}
-    {% include 'project/volumes/cgroups/_clone_cgroup.html' %}
+    {% include 'project/cgroups/_clone_cgroup.html' %}
 {% endblock %}
diff --git a/openstack_dashboard/dashboards/project/cgroups/templates/cgroups/create_snapshot.html b/openstack_dashboard/dashboards/project/cgroups/templates/cgroups/create_snapshot.html
index fc866c902d..987db068b3 100644
--- a/openstack_dashboard/dashboards/project/cgroups/templates/cgroups/create_snapshot.html
+++ b/openstack_dashboard/dashboards/project/cgroups/templates/cgroups/create_snapshot.html
@@ -3,5 +3,5 @@
 {% block title %}{{ page_title }}{% endblock %}
 
 {% block main %}
-    {% include 'project/volumes/cgroups/_create_snapshot.html' %}
+    {% include 'project/cgroups/_create_snapshot.html' %}
 {% endblock %}
diff --git a/openstack_dashboard/dashboards/project/cgroups/templates/cgroups/delete.html b/openstack_dashboard/dashboards/project/cgroups/templates/cgroups/delete.html
index 254fecc3b1..1932fdc0c2 100644
--- a/openstack_dashboard/dashboards/project/cgroups/templates/cgroups/delete.html
+++ b/openstack_dashboard/dashboards/project/cgroups/templates/cgroups/delete.html
@@ -3,5 +3,5 @@
 {% block title %}{{ page_title }}{% endblock %}
 
 {% block main %}
-    {% include 'project/volumes/cgroups/_delete.html' %}
+    {% include 'project/cgroups/_delete.html' %}
 {% endblock %}
diff --git a/openstack_dashboard/dashboards/project/cgroups/templates/cgroups/remove_vols.html b/openstack_dashboard/dashboards/project/cgroups/templates/cgroups/remove_vols.html
index e358c3c49b..e1e7cbd82f 100644
--- a/openstack_dashboard/dashboards/project/cgroups/templates/cgroups/remove_vols.html
+++ b/openstack_dashboard/dashboards/project/cgroups/templates/cgroups/remove_vols.html
@@ -3,5 +3,5 @@
 {% block title %}{{ page_title }}{% endblock %}
 
 {% block main %}
-    {% include 'project/volumes/cgroups/_remove_vols.html' %}
+    {% include 'project/cgroups/_remove_vols.html' %}
 {% endblock %}
diff --git a/openstack_dashboard/dashboards/project/cgroups/templates/cgroups/update.html b/openstack_dashboard/dashboards/project/cgroups/templates/cgroups/update.html
index 2dc627115a..ea8a2addb8 100644
--- a/openstack_dashboard/dashboards/project/cgroups/templates/cgroups/update.html
+++ b/openstack_dashboard/dashboards/project/cgroups/templates/cgroups/update.html
@@ -3,5 +3,5 @@
 {% block title %}{{ page_title }}{% endblock %}
 
 {% block main %}
-    {% include 'project/volumes/cgroups/_update.html' %}
+    {% include 'project/cgroups/_update.html' %}
 {% endblock %}