Multiple fixes:
- Shortcuts that are dashlets no longer mysteriously mutate into
their parents.
- Saving edits to dashlet preferences no longer kicks you out of
your version tag.
This commit is contained in:
parent
d95cd9b68d
commit
a02f17c887
2 changed files with 12 additions and 15 deletions
|
|
@ -25,6 +25,8 @@
|
|||
- RFE: JavaScript confirmation rather than page load for deleteUser
|
||||
- RFE: JavaScript confirmation rather than page load for deleteGroup
|
||||
- RFE: show which user locked an asset in the asset manager
|
||||
- fix: dashlet user preference setting causing nested dashboard to appear
|
||||
- fix: saving edits to dashlet shortcuts kicks you out of your version tag
|
||||
|
||||
7.0.6
|
||||
- fix: Error in DateTime.pm
|
||||
|
|
|
|||
|
|
@ -629,7 +629,7 @@ sub processPropertiesFromFormPost {
|
|||
my $self = shift;
|
||||
$self->SUPER::processPropertiesFromFormPost;
|
||||
my $scratchId = "Shortcut_" . $self->getId;
|
||||
$self->session->scratch->deleteAll($scratchId);
|
||||
$self->session->scratch->delete($scratchId);
|
||||
}
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
|
|
@ -749,7 +749,7 @@ sub www_saveUserPrefs {
|
|||
$self->uncacheOverrides;
|
||||
my $i18n = WebGUI::International->new($self->session);
|
||||
my $u = WebGUI::User->new($self->session, $self->discernUserId);
|
||||
foreach my $fieldId ($self->form->param) {
|
||||
foreach my $fieldId ($self->session->form->param) {
|
||||
my $field = WebGUI::ProfileField->new($self->session,$fieldId);
|
||||
next unless $field;
|
||||
$data{$field->getId} = $field->formProcess;
|
||||
|
|
@ -761,7 +761,7 @@ sub www_saveUserPrefs {
|
|||
}
|
||||
$u->profileField($field->getId,$data{$field->getId});
|
||||
}
|
||||
return $self->view;
|
||||
return $self->www_view;
|
||||
}
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
|
|
@ -867,19 +867,14 @@ sub www_saveOverride {
|
|||
#-------------------------------------------------------------------
|
||||
sub www_view {
|
||||
my $self = shift;
|
||||
if ($self->isDashlet) {
|
||||
return $self->session->privilege->noAccess() unless $self->canView;
|
||||
$self->session->asset($self->getParent);
|
||||
return $self->session->asset->www_view;
|
||||
my $shortcut = $self->getShortcut;
|
||||
|
||||
if (defined $shortcut) {
|
||||
return $shortcut->www_view;
|
||||
} elsif ($self->canEdit) {
|
||||
return $self->session->style->userStyle('<a href="'.$self->getUrl("func=delete").'">'.$self->notLinked.'</a>');
|
||||
} else {
|
||||
my $shortcut = $self->getShortcut;
|
||||
if (defined $shortcut) {
|
||||
return $shortcut->www_view;
|
||||
} elsif ($self->canEdit) {
|
||||
return $self->session->style->userStyle('<a href="'.$self->getUrl("func=delete").'">'.$self->notLinked.'</a>');
|
||||
} else {
|
||||
return $self->getParent->www_view;
|
||||
}
|
||||
return $self->notLinked;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue