9:41 a.m.
This patch addresses the issue of the last view of the Guests tab not
being remembered either after switching tabs or exiting Kimchi. When
switching view from List to Gallery (or vice versa), the next time the
user goes back to the Guests tab, whatever view it was last on should
be what is shown when going back to the Guests tab.
Signed-off-by: Socorro Stoppler <socorro(a)linux.vnet.ibm.com>
---
ui/js/src/kimchi.guest_main.js | 59 ++++++++++++++++++++++++++++++++++++++----
1 file changed, 54 insertions(+), 5 deletions(-)
diff --git a/ui/js/src/kimchi.guest_main.js b/ui/js/src/kimchi.guest_main.js
index 2f5e757..fe6d48d 100644
--- a/ui/js/src/kimchi.guest_main.js
+++ b/ui/js/src/kimchi.guest_main.js
@@ -801,15 +801,64 @@ kimchi.guestSetRequestHeader = function(xhr) {
};
kimchi.toggleGuestsGallery = function() {
- $(".wok-guest-list,
.wok-guest-gallery").toggleClass("wok-guest-list wok-guest-gallery");
- $(".wok-list, .wok-gallery").toggleClass("wok-list
wok-gallery");
- var text = $('#guest-gallery-table-button span.text').text();
- $('#guest-gallery-table-button span.text').text(text ==
i18n['KCHTMPL6005M'] ? i18n['KCHTMPL6004M'] :
i18n['KCHTMPL6005M']);
+ $(".wok-guest-list, .wok-guest-gallery").toggleClass("wok-guest-list
wok-guest-gallery");
+ $(".wok-list, .wok-gallery").toggleClass("wok-list
wok-gallery");
+ var text = $('#guest-gallery-table-button span.text').text();
+ $('#guest-gallery-table-button span.text').text(text ==
i18n['KCHTMPL6005M'] ? i18n['KCHTMPL6004M'] :
i18n['KCHTMPL6005M']);
+ var buttonText = $('#guest-gallery-table-button span.text').text();
+ if (buttonText.indexOf("Gallery") !== -1) {
+ // Currently in list view
+ kimchi.setGuestView("guestView", "list");
+ } else {
+ // Currently in gallery
+ kimchi.setGuestView("guestView", "gallery");
+ }
+};
+
+kimchi.setGuestView = function(name, value) {
+ window.localStorage.setItem(name, value);
+};
+
+kimchi.readGuestView = function(name) {
+ var viewName = window.localStorage.getItem(name);
+ if (viewName !== "") {
+ return viewName;
+ } else {
+ return null;
+ }
+};
+
+kimchi.showGuestGallery = function() {
+ $(".wok-guest-list").addClass("wok-guest-gallery");
+ $(".wok-list").addClass("wok-gallery");
+ $(".wok-guest-gallery").removeClass("wok-guest-list");
+ $(".wok-gallery").removeClass("wok-list");
+ $('#guest-gallery-table-button
span.text').text(i18n['KCHTMPL6004M']);
+};
+
+kimchi.showGuestList = function() {
+ $(".wok-guest-list").removeClass("wok-guest-gallery");
+ $(".wok-list").removeClass("wok-gallery");
+ $(".wok-guest-gallery").addClass("wok-guest-list");
+ $(".wok-gallery").addClass("wok-list");
+ $('#guest-gallery-table-button
span.text').text(i18n['KCHTMPL6005M']);
};
kimchi.guest_main = function() {
$('body').addClass('wok-list');
-
+ var viewFound = kimchi.readGuestView("guestView");
+ if (viewFound) {
+ if(viewFound === "gallery") {
+ // should be showing gallery
+ kimchi.showGuestGallery();
+ } else {
+ // Should be showing list
+ kimchi.showGuestList();
+ }
+ } else {
+ // Default to showing list
+ kimchi.showGuestList();
+ }
if (wok.tabMode['guests'] === 'admin') {
$('.tools').attr('style', 'display');
$("#vm-add").on("click", function(event) {
--
2.5.0