diff --git a/ui/new/jsp/event.jsp b/ui/new/jsp/event.jsp index 3a5aaf62fa5..ebfaeca3f12 100644 --- a/ui/new/jsp/event.jsp +++ b/ui/new/jsp/event.jsp @@ -26,94 +26,98 @@ <%=t.t("Details")%>
- -
-
-
-
- <%=t.t("id")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("Initiated.By")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("Owner.Account")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("Type")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("Level")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("Description")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("State")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("Date")%>:
-
-
-
-
-
-
-
+ +
+
+
+
+
+ <%=t.t("id")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("Initiated.By")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("Owner.Account")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("Type")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("Level")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("Description")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("State")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("Date")%>:
+
+
+
+
+
+
+
+
\ No newline at end of file diff --git a/ui/new/scripts/cloud.core2.event.js b/ui/new/scripts/cloud.core2.event.js index e4d44ba04ef..356b3068021 100644 --- a/ui/new/scripts/cloud.core2.event.js +++ b/ui/new/scripts/cloud.core2.event.js @@ -38,20 +38,28 @@ function eventToMidmenu(jsonObj, $midmenuItem1) { function eventToRightPanel($midmenuItem1) { copyActionInfoFromMidMenuToRightPanel($midmenuItem1); - eventJsonToDetailsTab($midmenuItem1); + $("#right_panel_content").data("$midmenuItem1", $midmenuItem1); + eventJsonToDetailsTab(); } -function eventJsonToDetailsTab($midmenuItem1) { - var jsonObj = $midmenuItem1.data("jsonObj"); - var $detailsTab = $("#right_panel_content #tab_content_details"); - $detailsTab.data("jsonObj", jsonObj); - - $detailsTab.find("#id").text(fromdb(jsonObj.id)); - $detailsTab.find("#username").text(fromdb(jsonObj.username)); - $detailsTab.find("#account").text(fromdb(jsonObj.account)); - $detailsTab.find("#type").text(jsonObj.type); - $detailsTab.find("#level").text(jsonObj.level); - $detailsTab.find("#description").text(fromdb(jsonObj.description)); - $detailsTab.find("#state").text(jsonObj.state); - setDateField(jsonObj.created, $detailsTab.find("#created")); +function eventJsonToDetailsTab() { + var $thisTab = $("#right_panel_content #tab_content_details"); + $thisTab.find("#tab_container").hide(); + $thisTab.find("#tab_spinning_wheel").show(); + + var $midmenuItem1 = $("#right_panel_content").data("$midmenuItem1"); + var jsonObj = $midmenuItem1.data("jsonObj"); + $thisTab.data("jsonObj", jsonObj); + + $thisTab.find("#id").text(fromdb(jsonObj.id)); + $thisTab.find("#username").text(fromdb(jsonObj.username)); + $thisTab.find("#account").text(fromdb(jsonObj.account)); + $thisTab.find("#type").text(jsonObj.type); + $thisTab.find("#level").text(jsonObj.level); + $thisTab.find("#description").text(fromdb(jsonObj.description)); + $thisTab.find("#state").text(jsonObj.state); + setDateField(jsonObj.created, $thisTab.find("#created")); + + $thisTab.find("#tab_spinning_wheel").hide(); + $thisTab.find("#tab_container").show(); } \ No newline at end of file diff --git a/ui/new/scripts/cloud.core2.iso.js b/ui/new/scripts/cloud.core2.iso.js index 453b409917d..11958c24f58 100644 --- a/ui/new/scripts/cloud.core2.iso.js +++ b/ui/new/scripts/cloud.core2.iso.js @@ -184,7 +184,8 @@ function isoJsonToDetailsTab() { var jsonObj = $midmenuItem1.data("jsonObj"); - //comment the following code because listIsos API has a bug => listIsos API returns nothing when id is 200(tool) and zoneid is specified + + //listIsos API has a bug => it returns nothing when id is 200(xs-tools.iso) and zoneid is specified. So, comment the following code before the bug is fixed. /* var array1 = []; var id = $midmenuItem1.data("jsonObj").id;