oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Multiple fixes:

Browse source 
- 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:
Drake 2006-08-30 05:19:23 +00:00
parent d95cd9b68d
commit a02f17c887
2 changed files with 12 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/changelog/7.x.x.txt
View file

@ -25,6 +25,8 @@
- RFE: JavaScript confirmation rather than page load for deleteUser - RFE: JavaScript confirmation rather than page load for deleteUser
- RFE: JavaScript confirmation rather than page load for deleteGroup - RFE: JavaScript confirmation rather than page load for deleteGroup
- RFE: show which user locked an asset in the asset manager - 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 7.0.6
- fix: Error in DateTime.pm - fix: Error in DateTime.pm

25
lib/WebGUI/Asset/Shortcut.pm
View file

@ -629,7 +629,7 @@ sub processPropertiesFromFormPost {
my $self = shift; my $self = shift;
$self->SUPER::processPropertiesFromFormPost; $self->SUPER::processPropertiesFromFormPost;
my $scratchId = "Shortcut_" . $self->getId; my $scratchId = "Shortcut_" . $self->getId;
$self->session->scratch->deleteAll($scratchId); $self->session->scratch->delete($scratchId);
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
@ -749,7 +749,7 @@ sub www_saveUserPrefs {
$self->uncacheOverrides; $self->uncacheOverrides;
my $i18n = WebGUI::International->new($self->session); my $i18n = WebGUI::International->new($self->session);
my $u = WebGUI::User->new($self->session, $self->discernUserId); 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); my $field = WebGUI::ProfileField->new($self->session,$fieldId);
next unless $field; next unless $field;
$data{$field->getId} = $field->formProcess; $data{$field->getId} = $field->formProcess;
@ -761,7 +761,7 @@ sub www_saveUserPrefs {
} }
$u->profileField($field->getId,$data{$field->getId}); $u->profileField($field->getId,$data{$field->getId});
} }
return $self->view; return $self->www_view;
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
@ -867,19 +867,14 @@ sub www_saveOverride {
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_view { sub www_view {
my $self = shift; my $self = shift;
if ($self->isDashlet) { my $shortcut = $self->getShortcut;
return $self->session->privilege->noAccess() unless $self->canView;
$self->session->asset($self->getParent); if (defined $shortcut) {
return $self->session->asset->www_view; return $shortcut->www_view;
} elsif ($self->canEdit) {
return $self->session->style->userStyle('<a href="'.$self->getUrl("func=delete").'">'.$self->notLinked.'</a>');
} else { } else {
my $shortcut = $self->getShortcut; return $self->notLinked;
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;
}
} }
} }