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
0fa60f36
Commit
0fa60f36
authored
May 22, 2012
by
Dietmar Maurer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixes for new pve-access-control
parent
8fac8bf0
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
7 deletions
+18
-7
changelog.Debian
debian/changelog.Debian
+6
-0
defines.mk
defines.mk
+1
-1
AuthEdit.js
www/manager/dc/AuthEdit.js
+8
-3
AuthView.js
www/manager/dc/AuthView.js
+3
-3
No files found.
debian/changelog.Debian
View file @
0fa60f36
pve-manager (2.1-5) unstable; urgency=low
* fixes for new pve-access-control (Auth plugins).
-- Proxmox Support Team <support@proxmox.com> Tue, 22 May 2012 10:49:37 +0200
pve-manager (2.1-4) unstable; urgency=low
pve-manager (2.1-4) unstable; urgency=low
* updated russian translation
* updated russian translation
...
...
defines.mk
View file @
0fa60f36
...
@@ -2,7 +2,7 @@ RELEASE=2.1
...
@@ -2,7 +2,7 @@ RELEASE=2.1
VERSION=2.1
VERSION=2.1
PACKAGE=pve-manager
PACKAGE=pve-manager
PACKAGERELEASE=
4
PACKAGERELEASE=
5
BINDIR=${DESTDIR}/usr/bin
BINDIR=${DESTDIR}/usr/bin
PERLLIBDIR=${DESTDIR}/usr/share/perl5
PERLLIBDIR=${DESTDIR}/usr/share/perl5
...
...
www/manager/dc/AuthEdit.js
View file @
0fa60f36
...
@@ -89,9 +89,10 @@ Ext.define('PVE.dc.AuthEdit', {
...
@@ -89,9 +89,10 @@ Ext.define('PVE.dc.AuthEdit', {
allowBlank
:
false
allowBlank
:
false
},
},
{
{
xtype
:
'
textfield
'
,
xtype
:
'
pve
textfield
'
,
fieldLabel
:
gettext
(
'
Fallback Server
'
),
fieldLabel
:
gettext
(
'
Fallback Server
'
),
name
:
'
server2
'
deleteEmpty
:
!
me
.
create
,
name
:
'
server2
'
},
},
{
{
xtype
:
'
numberfield
'
,
xtype
:
'
numberfield
'
,
...
@@ -115,8 +116,12 @@ Ext.define('PVE.dc.AuthEdit', {
...
@@ -115,8 +116,12 @@ Ext.define('PVE.dc.AuthEdit', {
column2
:
column2
,
column2
:
column2
,
onGetValues
:
function
(
values
)
{
onGetValues
:
function
(
values
)
{
if
(
!
values
.
port
)
{
if
(
!
values
.
port
)
{
values
.
port
=
0
;
if
(
!
me
.
create
)
{
PVE
.
Utils
.
assemble_field_data
(
values
,
{
'
delete
'
:
'
port
'
});
}
delete
values
.
port
;
}
}
if
(
me
.
create
)
{
if
(
me
.
create
)
{
values
.
type
=
me
.
authType
;
values
.
type
=
me
.
authType
;
}
}
...
...
www/manager/dc/AuthView.js
View file @
0fa60f36
...
@@ -26,7 +26,7 @@ Ext.define('PVE.dc.AuthView', {
...
@@ -26,7 +26,7 @@ Ext.define('PVE.dc.AuthView', {
return
;
return
;
}
}
if
(
rec
.
data
.
type
===
'
builtin
'
)
{
if
(
rec
.
data
.
type
===
'
pve
'
||
rec
.
data
.
type
===
'
pam
'
)
{
return
;
return
;
}
}
...
@@ -43,7 +43,7 @@ Ext.define('PVE.dc.AuthView', {
...
@@ -43,7 +43,7 @@ Ext.define('PVE.dc.AuthView', {
disabled
:
true
,
disabled
:
true
,
selModel
:
sm
,
selModel
:
sm
,
enableFn
:
function
(
rec
)
{
enableFn
:
function
(
rec
)
{
return
rec
.
data
.
type
!==
'
builtin
'
;
return
!
(
rec
.
data
.
type
===
'
pve
'
||
rec
.
data
.
type
===
'
pam
'
)
;
},
},
handler
:
run_editor
handler
:
run_editor
});
});
...
@@ -57,7 +57,7 @@ Ext.define('PVE.dc.AuthView', {
...
@@ -57,7 +57,7 @@ Ext.define('PVE.dc.AuthView', {
"
'
"
+
rec
.
data
.
realm
+
"
'
"
);
"
'
"
+
rec
.
data
.
realm
+
"
'
"
);
},
},
enableFn
:
function
(
rec
)
{
enableFn
:
function
(
rec
)
{
return
rec
.
data
.
type
!==
'
builtin
'
;
return
!
(
rec
.
data
.
type
===
'
pve
'
||
rec
.
data
.
type
===
'
pam
'
)
;
},
},
handler
:
function
(
btn
,
event
,
rec
)
{
handler
:
function
(
btn
,
event
,
rec
)
{
var
realm
=
rec
.
data
.
realm
;
var
realm
=
rec
.
data
.
realm
;
...
...
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