Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
pve-manager
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
pve-manager
Commits
06decebf
Commit
06decebf
authored
Jan 22, 2015
by
Dietmar Maurer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
PendingObjectGrid: improve detection of pending changes
parent
6f3b2d78
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
8 deletions
+24
-8
PendingObjectGrid.js
www/manager/grid/PendingObjectGrid.js
+18
-1
HardwareView.js
www/manager/qemu/HardwareView.js
+6
-7
No files found.
www/manager/grid/PendingObjectGrid.js
View file @
06decebf
...
...
@@ -18,6 +18,23 @@ Ext.define('PVE.grid.PendingObjectGrid', {
return
defaultValue
;
},
hasPendingChanges
:
function
(
key
)
{
var
me
=
this
;
var
rows
=
me
.
rows
;
var
rowdef
=
(
rows
&&
rows
[
key
])
?
rows
[
key
]
:
{};
var
keys
=
rowdef
.
multiKey
||
[
key
];
var
pending
=
false
;
Ext
.
Array
.
each
(
keys
,
function
(
k
)
{
var
rec
=
me
.
store
.
getById
(
k
);
if
(
rec
&&
rec
.
data
&&
Ext
.
isDefined
(
rec
.
data
.
pending
)
&&
(
rec
.
data
.
pending
!==
''
))
{
pending
=
true
;
}
});
return
pending
;
},
renderValue
:
function
(
value
,
metaData
,
record
,
rowIndex
,
colIndex
,
store
)
{
var
me
=
this
;
var
rows
=
me
.
rows
;
...
...
@@ -30,7 +47,7 @@ Ext.define('PVE.grid.PendingObjectGrid', {
if
(
renderer
)
{
current
=
renderer
(
value
,
metaData
,
record
,
rowIndex
,
colIndex
,
store
,
false
);
if
(
(
Ext
.
isDefined
(
record
.
data
.
pending
)
&&
(
record
.
data
.
pending
!==
''
))
||
rowdef
.
multiValues
)
{
if
(
me
.
hasPendingChanges
(
key
)
)
{
pending
=
renderer
(
record
.
data
.
pending
,
metaData
,
record
,
rowIndex
,
colIndex
,
store
,
true
);
}
if
(
pending
==
current
)
{
...
...
www/manager/qemu/HardwareView.js
View file @
06decebf
...
...
@@ -63,7 +63,7 @@ Ext.define('PVE.qemu.HardwareView', {
'
PVE.qemu.ProcessorEdit
'
:
undefined
,
tdCls
:
'
pve-itype-icon-processor
'
,
defaultValue
:
1
,
multi
Values
:
1
,
multi
Key
:
[
'
sockets
'
,
'
cpu
'
,
'
cores
'
,
'
numa
'
]
,
renderer
:
function
(
value
,
metaData
,
record
,
rowIndex
,
colIndex
,
store
,
pending
)
{
var
sockets
=
me
.
getObjectValue
(
'
sockets
'
,
1
,
pending
);
...
...
@@ -390,23 +390,22 @@ Ext.define('PVE.qemu.HardwareView', {
return
false
;
}
if
(
Ext
.
isDefined
(
rec
.
data
.
pending
)
&&
(
rec
.
data
.
pending
!==
''
))
{
return
true
;
}
if
(
rec
.
data
[
'
delete
'
])
{
return
true
;
}
return
false
;
return
me
.
hasPendingChanges
(
rec
.
data
.
key
);
},
handler
:
function
(
b
,
e
,
rec
)
{
var
rowdef
=
me
.
rows
[
rec
.
data
.
key
]
||
{};
var
keys
=
rowdef
.
multiKey
||
[
rec
.
data
.
key
];
var
revert
=
keys
.
join
(
'
,
'
);
PVE
.
Utils
.
API2Request
({
url
:
'
/api2/extjs/
'
+
baseurl
,
waitMsgTarget
:
me
,
method
:
'
PUT
'
,
params
:
{
'
revert
'
:
re
c
.
data
.
key
'
revert
'
:
re
vert
},
callback
:
function
()
{
reload
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment