Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-11-25 23:10:16 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,503 Commits 11 Branches 48 Tags 186 MiB
033e7df8af
Commit Graph

4503 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mihaela Stoica
f983dd9e90 Merge pull request #1792 from GaborApatiNagy/master_REQ-411_merge 
Merge REQ-411 into master
 2017-09-29 12:12:09 +01:00
Gabor Apati-Nagy
a8db7bfae9 Merge remote-tracking branch 'github_xenadmin/REQ-411' into master_REQ-411_merge 
Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>

Conflicts:
	XenAdmin/Core/Updates.cs
	XenAdmin/TabPages/ManageUpdatesPage.cs
	XenAdmin/Wizards/PatchingWizard/PatchingWizard_PrecheckPage.cs
	XenModel/Messages.Designer.cs
 2017-09-29 11:56:46 +01:00
Gabor Apati-Nagy
0cc907bb14 CP-24709: Add a warning in the New VM wizard and Import wizard if the pool is licensed using XD/XA entitlement (#1791) 
* CP-24709: Add a warning in the New VM wizard and Import wizard if the pool is licensed using XD/XA entitlement

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>

* CP-24709: Add a warning in the New VM wizard and Import wizard if the pool is licensed using XD/XA entitlement

Fixed unintended designer code additions/changes

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
 2017-09-29 11:05:57 +01:00
Ji Jiang
a70307a3a6 CA-267553: Fix offline XC showing up to date bug 
The bug is that when XC does not connect to Internet, By Server Update
page shows all the hosts up to date.

Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
 2017-09-29 10:44:50 +01:00
Gabor Apati-Nagy
39026f300e CP-24707: Add license status information to the title bar for pool and hosts (#1783) 
* CP-24707: Add license status information to the title bar for pool and hosts

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>

* CP-24707: Add license status information to the title bar for pool and hosts

Show expired licenses as Unlicensed in the Header

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>

* CP-24707: Add license status information to the title bar for pool and hosts

Improvements, fixes following the code review

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>

* CP-24707: Add license status information to the title bar for pool and hosts

More code to make it nicer

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>

* CP-24707: Add license status information to the title bar for pool and hosts

More code to make it even more nicer

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
 2017-09-28 16:10:41 +01:00
Mihaela Stoica
21b941c20a Merge pull request #1784 from jijiang/REQ-528 
CP-24708: Show different unlicensed pool/host icon
 2017-09-28 14:11:54 +01:00
Mihaela Stoica
7f10e98727 Merge pull request #1787 from jijiang/master 
REQ-534: Fix some UI text display
 2017-09-27 16:50:39 +01:00
Ji Jiang
268b19421f REQ-534: Fix some UI text display 
Based on comments from doc team:
1) Column title "Patching Status" should be replaced by "Status" in csv file
2) In View dropdown, "By Host" should be replaced by "By Server"

Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
 2017-09-27 15:14:15 +01:00
Mihaela Stoica
f43b607879 Merge pull request #1778 from jijiang/REQ-67-update 
Add message alert, license check and warning msg to CBT
 2017-09-27 13:19:23 +01:00
Ji Jiang
41df6e5c35 Fix alert message based on comments 
Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
 2017-09-27 12:57:25 +01:00
Joey
e971f0aff4 Merge pull request #1785 from MihaelaStoica/REQ-566 
CP-24498: RPU wizard to block the selection of unlicensed hosts
 2017-09-27 11:53:47 +01:00
Mihaela Stoica
99cd1423e4 CP-24498: RPU wizard to block the selection of unlicensed hosts 
Fixed the tests

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2017-09-27 11:43:55 +01:00
Ji Jiang
d0687e5ae3 CP-24708: Show different unlicensed pool/host icon 
Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
 2017-09-27 11:30:12 +01:00
Gabor Apati-Nagy
fb3cd9fc32 Merge pull request #1782 from MihaelaStoica/REQ-566 
CP-24498: RPU wizard to block the selection of unlicensed hosts
 2017-09-26 15:04:24 +01:00
Mihaela Stoica
8464712335 CP-24498: RPU wizard to block the selection of unlicensed hosts 
Changes following code review

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2017-09-26 15:01:35 +01:00
Ji Jiang
37499d81b6 CP-24477: Add licence check for CBT feature 
Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
 2017-09-25 18:19:15 +01:00
Ji Jiang
cb97e3788e CP-24405: Add message alert for CBT error msg 
Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
 2017-09-25 15:14:53 +01:00
Ji Jiang
a63ca0a030 CP-24344: Add HelpID and warning when disable CBT 
Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
 2017-09-25 15:14:09 +01:00
Mihaela Stoica
0e5f1335d4 CP-24498: RPU wizard to block the selection of unlicensed hosts 
Also includes some improvements to the Select Pools page of the RPU wizard
- do not show the checkbox if the item is disabled
- show the icon for the pool items, not only for hosts (making this consistent with the similar page in the Update Wizard)

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2017-09-25 13:27:06 +01:00
Mihaela Stoica
f32e0a710b Merge pull request #1780 from jijiang/CP-24704 
CP-24704: Add pool size license check
 2017-09-25 12:18:14 +01:00
Ji Jiang
0018981782 CP-24704: Add pool size license check 
Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
 2017-09-25 09:53:37 +01:00
Mihaela Stoica
43a7533271 Merge pull request #1781 from MihaelaStoica/master 
Sort Messages.resx
 2017-09-23 02:20:30 +01:00
Mihaela Stoica
ee61818f5e Sort Messages.resx 
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2017-09-23 02:07:33 +01:00
Ji Jiang
806c3a5852 Update XC XenAPI to XS/feature/CBT branch 
Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
 2017-09-22 14:28:06 +01:00
Mihaela Stoica
79f2662abe Merge pull request #1775 from jijiang/REQ-67-us 
Merge master into REQ-67
 2017-09-22 14:14:13 +01:00
Gabor Apati-Nagy
9fec33d892 Merge pull request #1777 from MihaelaStoica/master 
CP-24806: Update the RPU hotfix to version 4
 2017-09-22 13:58:34 +01:00
Mihaela Stoica
50623be97c CP-24806: Update the RPU hotfix to version 4 
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2017-09-22 13:55:28 +01:00
Ji Jiang
152c25d2f2 Fix compilation error after merging 
Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
 2017-09-22 11:07:56 +01:00
Ji Jiang
fce3a725cd Merge 'upstream/master' into REQ-67-us 
Conflicts:
	XenAdmin/Commands/MigrateVirtualDiskCommand.cs
	XenAdmin/Commands/MoveVirtualDiskCommand.cs
	XenAdmin/TabPages/SrStoragePage.cs
	XenModel/Messages.resx

Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
 2017-09-22 11:02:51 +01:00
Mihaela Stoica
c02298e161 Merge pull request #1770 from jijiang/REQ-534 
Merge REQ-534 to master branch
 2017-09-19 12:50:32 +01:00
Ji Jiang
8f03795797 Fix compilation error after rebase REQ-534 on master 
Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
 2017-09-18 17:11:43 +01:00
Ji Jiang
f6f17746db CA-265684: Fix bug of disabled "Export All" button 
The bug is that "Export All" button is disabled when all hosts are up to
date.

Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
 2017-09-18 15:32:49 +01:00
Ji Jiang
026c2b8d47 CA-265410: Fix missing required updates 
The bug is that required updates for slaves of pre-dundee pool don't show.

Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
 2017-09-18 15:32:48 +01:00
Ji Jiang
7fd18e99cf CP-24032: Updates page collapsing enhancement 
Store the pool collapsing state and rebuild it after refresh.

Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
 2017-09-18 15:32:48 +01:00
Ji Jiang
41cec6e42b CP-23967: change two superclass to abstract class 
Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
 2017-09-18 15:32:48 +01:00
Ji Jiang
30400790c1 CP-24032: Updates page: collapsing funtionality 
Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
 2017-09-18 15:32:48 +01:00
Ji Jiang
17f76870b3 CP-23967: Fix and unify sorting in different views 
The commit fixes bug and unify sorting rules in ManageUpdatesPage,
PatchingWizard_SelectServers and RollingUpgradeWizardSelectPool data
grid views.

The rules are:
1) Name column sorted purely by name.
2) Other columns sorted by string value, if the same, sorted by default,
which is still in order even in reverse direction.

Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
 2017-09-18 15:32:48 +01:00
Ji Jiang
880bde38f6 CP-23455: Add Update btn in Updates page "By Host" 
Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
 2017-09-18 15:32:48 +01:00
Ji Jiang
d8ca87cd15 CP-24210: fix the patch sorting in newer version 
Keep order consistency with general tab for newer version servers.

Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
 2017-09-18 15:32:48 +01:00
Ji Jiang
1e335de316 CP-24210: Populate "By Host" view correctly 
1) Show required updates in case of versions without minimal patches
2) Hide version text in installed updates when version is Ely or above

Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
 2017-09-18 15:32:48 +01:00
Ji Jiang
0a33bf1448 Fix PatchingWizard_SelectServers version sorting 
The problem is that pool and host rows are mixed when sorting by
version.

Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
 2017-09-18 15:32:48 +01:00
Ji Jiang
dfe7a2ea70 Refactoring RollingUpgradeWizardSelectPool sorting 
Combine sorting by Description and by Version to a single class

Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
 2017-09-18 15:32:48 +01:00
Ji Jiang
af9143d199 CP-23967: sort "By Host" view rows in Updates page 
Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
 2017-09-18 15:32:48 +01:00
Ji Jiang
b5a8282089 CP-23454: Export function in "By Host" view 
Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
 2017-09-18 15:32:47 +01:00
Ji Jiang
8b2bc83a12 CP-23453: Populate "By Host" view in Updates page 
Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
 2017-09-18 15:32:47 +01:00
Ji Jiang
66b1b52ad1 CP-23450: Add "View" btn in Updates page toolbar 
1) View button has "By Update" and "By Host" options.
2) "By Host" view hides "Filter by Date", "Dismiss All" and "Restore
Dismissed Updates" buttons.
3) "By Host" view turns date filter OFF.

Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
 2017-09-18 14:58:04 +01:00
Mihaela Stoica
e788e4d106 Merge pull request #1763 from xenserver/REQ-230 
Merge REQ-230 from feature branch to master
 2017-09-18 14:40:10 +01:00
Mihaela Stoica
3028e5860b Merge pull request #1768 from jijiang/REQ-67 
CP-24344: Fix REQ-67 test failure
 2017-09-18 14:28:53 +01:00
Ji Jiang
d2d0c2cd09 CP-24344: Fix REQ-67 test failure 
Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
 2017-09-18 14:07:20 +01:00
Mihaela Stoica
d4c980dbfd Merge branch 'master' into REQ-230 2017-09-18 13:12:06 +01:00