0x2620/pandora
2
1
Fork 1
Code Issues 1.2k Pull requests Releases Wiki Activity

Compare commits

base: 0x2620:5aed1359069c42fe2b6e96662bb27aeea9d2ede1
Branches Tags
0x2620:master
0x2620:stable
..
compare: 0x2620:717248bc7380a303d7d56e15de90187ef474849e
Branches Tags
0x2620:master
0x2620:stable

No commits in common. "5aed1359069c42fe2b6e96662bb27aeea9d2ede1" and "717248bc7380a303d7d56e15de90187ef474849e" have entirely different histories.
5aed135906 ... 717248bc73

3 changed files with 14 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pandora/user/views.py
View file

@ -362,7 +362,7 @@ def editUser(request, data):
response = json_response(status=403, text='email already in use')
return render_to_json_response(response)
user.email = data['email']
if 'level' in data and request.user.profile.get_level() == 'admin':
if 'level' in data:
profile.set_level(data['level'])
if 'notes' in data:
profile.notes = data['notes']

2
static/js/listDialog.js
View file

@ -444,7 +444,7 @@ pandora.ui.listGeneralPanel = function(listData) {
return listData.status == 'private' ? 160 : 136;
}
function getDescriptionTop() {
return listData.status == 'private' ? 112 : 136;
return listData.status == 'private' ? 64 : 88;
}
function getSubscribersAction() {
return listData.status == 'private' ? 'hide' : 'show';

32
static/js/usersDialog.js
View file

@ -680,27 +680,19 @@ pandora.ui.usersDialog = function() {
}
}),
pandora.user.level == 'admin'
? Ox.Select({
id: 'level',
items: pandora.site.userLevels.slice(1).map(function(level) {
return {
id: level,
title: Ox.toTitleCase(level)
};
}),
label: Ox._('Level'),
labelWidth: 80,
value: user.level,
width: formWidth - 16
}) : Ox.Input({
disabled: true,
id: 'level',
label: Ox._('Level'),
labelWidth: 80,
value: Ox.toTitleCase(user.level),
width: formWidth - 16
Ox.Select({
id: 'level',
items: pandora.site.userLevels.slice(1).map(function(level) {
return {
id: level,
title: Ox.toTitleCase(level)
};
}),
label: Ox._('Level'),
labelWidth: 80,
value: user.level,
width: formWidth - 16
}),
Ox.Checkbox({
id: 'newsletter',
label: Ox._('Newsletter'),