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
f3ddc10d
Commit
f3ddc10d
authored
Apr 24, 2012
by
Dietmar Maurer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix bug #179: set default button 'no' for dangerous actions
parent
c8e44125
Changes
9
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
1218 additions
and
7 deletions
+1218
-7
changelog.Debian
debian/changelog.Debian
+6
-0
defines.mk
defines.mk
+1
-1
Makefile
po/Makefile
+1
-1
tr.po
po/tr.po
+1191
-0
Button.js
www/manager/button/Button.js
+15
-5
BackupView.js
www/manager/grid/BackupView.js
+1
-0
Config.js
www/manager/openvz/Config.js
+1
-0
Config.js
www/manager/qemu/Config.js
+1
-0
HardwareView.js
www/manager/qemu/HardwareView.js
+1
-0
No files found.
debian/changelog.Debian
View file @
f3ddc10d
pve-manager (2.0-64) unstable; urgency=low
* fix bug #179: set default button 'no' for dangerous actions
-- Proxmox Support Team <support@proxmox.com> Tue, 24 Apr 2012 08:09:23 +0200
pve-manager (2.0-63) unstable; urgency=low
pve-manager (2.0-63) unstable; urgency=low
* fix bug 128: implement pvectl startall/stopall
* fix bug 128: implement pvectl startall/stopall
...
...
defines.mk
View file @
f3ddc10d
...
@@ -2,7 +2,7 @@ RELEASE=2.0
...
@@ -2,7 +2,7 @@ RELEASE=2.0
VERSION=2.0
VERSION=2.0
PACKAGE=pve-manager
PACKAGE=pve-manager
PACKAGERELEASE=6
3
PACKAGERELEASE=6
4
BINDIR=${DESTDIR}/usr/bin
BINDIR=${DESTDIR}/usr/bin
PERLLIBDIR=${DESTDIR}/usr/share/perl5
PERLLIBDIR=${DESTDIR}/usr/share/perl5
...
...
po/Makefile
View file @
f3ddc10d
include
../defines.mk
include
../defines.mk
LINGUAS
=
de it fr ja es sv ru zh_CN
LINGUAS
=
de it fr ja es sv ru
tr
zh_CN
all
:
$(patsubst %
,
pve-lang-%.js
,
$(LINGUAS))
all
:
$(patsubst %
,
pve-lang-%.js
,
$(LINGUAS))
...
...
po/tr.po
0 → 100644
View file @
f3ddc10d
This diff is collapsed.
Click to expand it.
www/manager/button/Button.js
View file @
f3ddc10d
...
@@ -15,6 +15,9 @@ Ext.define('PVE.button.Button', {
...
@@ -15,6 +15,9 @@ Ext.define('PVE.button.Button', {
// function(record) or text
// function(record) or text
confirmMsg
:
false
,
confirmMsg
:
false
,
// take special care in confirm box (select no as default).
dangerous
:
false
,
initComponent
:
function
()
{
initComponent
:
function
()
{
/*jslint confusion: true */
/*jslint confusion: true */
...
@@ -37,11 +40,18 @@ Ext.define('PVE.button.Button', {
...
@@ -37,11 +40,18 @@ Ext.define('PVE.button.Button', {
if
(
Ext
.
isFunction
(
me
.
confirmMsg
))
{
if
(
Ext
.
isFunction
(
me
.
confirmMsg
))
{
msg
=
me
.
confirmMsg
(
rec
);
msg
=
me
.
confirmMsg
(
rec
);
}
}
Ext
.
Msg
.
confirm
(
gettext
(
'
Confirm
'
),
msg
,
function
(
btn
)
{
Ext
.
MessageBox
.
defaultButton
=
me
.
dangerous
?
2
:
1
;
Ext
.
Msg
.
show
({
title
:
gettext
(
'
Confirmtest
'
),
icon
:
'
ext-mb-question
'
,
msg
:
msg
,
buttons
:
Ext
.
Msg
.
YESNO
,
callback
:
function
(
btn
)
{
if
(
btn
!==
'
yes
'
)
{
if
(
btn
!==
'
yes
'
)
{
return
;
return
;
}
}
me
.
realHandler
(
button
,
event
,
rec
);
me
.
realHandler
(
button
,
event
,
rec
);
}
});
});
}
else
{
}
else
{
me
.
realHandler
(
button
,
event
,
rec
);
me
.
realHandler
(
button
,
event
,
rec
);
...
...
www/manager/grid/BackupView.js
View file @
f3ddc10d
...
@@ -116,6 +116,7 @@ Ext.define('PVE.grid.BackupView', {
...
@@ -116,6 +116,7 @@ Ext.define('PVE.grid.BackupView', {
text
:
gettext
(
'
Remove
'
),
text
:
gettext
(
'
Remove
'
),
disabled
:
true
,
disabled
:
true
,
selModel
:
sm
,
selModel
:
sm
,
dangerous
:
true
,
confirmMsg
:
function
(
rec
)
{
confirmMsg
:
function
(
rec
)
{
var
msg
=
Ext
.
String
.
format
(
gettext
(
'
Are you sure you want to remove entry {0}
'
),
var
msg
=
Ext
.
String
.
format
(
gettext
(
'
Are you sure you want to remove entry {0}
'
),
"
'
"
+
rec
.
data
.
volid
+
"
'
"
);
"
'
"
+
rec
.
data
.
volid
+
"
'
"
);
...
...
www/manager/openvz/Config.js
View file @
f3ddc10d
...
@@ -85,6 +85,7 @@ Ext.define('PVE.openvz.Config', {
...
@@ -85,6 +85,7 @@ Ext.define('PVE.openvz.Config', {
var
removeBtn
=
Ext
.
create
(
'
PVE.button.Button
'
,
{
var
removeBtn
=
Ext
.
create
(
'
PVE.button.Button
'
,
{
text
:
gettext
(
'
Remove
'
),
text
:
gettext
(
'
Remove
'
),
disabled
:
!
caps
.
vms
[
'
VM.Allocate
'
],
disabled
:
!
caps
.
vms
[
'
VM.Allocate
'
],
dangerous
:
true
,
confirmMsg
:
Ext
.
String
.
format
(
gettext
(
'
Are you sure you want to remove VM {0}? This will permanently erase all VM data.
'
),
vmid
),
confirmMsg
:
Ext
.
String
.
format
(
gettext
(
'
Are you sure you want to remove VM {0}? This will permanently erase all VM data.
'
),
vmid
),
handler
:
function
()
{
handler
:
function
()
{
PVE
.
Utils
.
API2Request
({
PVE
.
Utils
.
API2Request
({
...
...
www/manager/qemu/Config.js
View file @
f3ddc10d
...
@@ -85,6 +85,7 @@ Ext.define('PVE.qemu.Config', {
...
@@ -85,6 +85,7 @@ Ext.define('PVE.qemu.Config', {
var
removeBtn
=
Ext
.
create
(
'
PVE.button.Button
'
,
{
var
removeBtn
=
Ext
.
create
(
'
PVE.button.Button
'
,
{
text
:
gettext
(
'
Remove
'
),
text
:
gettext
(
'
Remove
'
),
disabled
:
!
caps
.
vms
[
'
VM.Allocate
'
],
disabled
:
!
caps
.
vms
[
'
VM.Allocate
'
],
dangerous
:
true
,
confirmMsg
:
Ext
.
String
.
format
(
gettext
(
'
Are you sure you want to remove VM {0}? This will permanently erase all VM data.
'
),
vmid
),
confirmMsg
:
Ext
.
String
.
format
(
gettext
(
'
Are you sure you want to remove VM {0}? This will permanently erase all VM data.
'
),
vmid
),
handler
:
function
()
{
handler
:
function
()
{
PVE
.
Utils
.
API2Request
({
PVE
.
Utils
.
API2Request
({
...
...
www/manager/qemu/HardwareView.js
View file @
f3ddc10d
...
@@ -210,6 +210,7 @@ Ext.define('PVE.qemu.HardwareView', {
...
@@ -210,6 +210,7 @@ Ext.define('PVE.qemu.HardwareView', {
text
:
gettext
(
'
Remove
'
),
text
:
gettext
(
'
Remove
'
),
selModel
:
sm
,
selModel
:
sm
,
disabled
:
true
,
disabled
:
true
,
dangerous
:
true
,
confirmMsg
:
function
(
rec
)
{
confirmMsg
:
function
(
rec
)
{
var
msg
=
Ext
.
String
.
format
(
gettext
(
'
Are you sure you want to remove entry {0}
'
),
var
msg
=
Ext
.
String
.
format
(
gettext
(
'
Are you sure you want to remove entry {0}
'
),
"
'
"
+
me
.
renderKey
(
rec
.
data
.
key
,
{},
rec
)
+
"
'
"
);
"
'
"
+
me
.
renderKey
(
rec
.
data
.
key
,
{},
rec
)
+
"
'
"
);
...
...
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