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

Multiple fixes:

Browse source 
- Caching of overrides was using inconsistent tag in Shortcut assets.
  - Fix JavaScript race condition in dashlet prefs form code.
This commit is contained in:
Drake 2006-09-01 02:49:13 +00:00
parent 3922cf7238
commit 58449bb158
3 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -33,6 +33,8 @@
- API change: in ProfileField, the get*Fields family of methods are now class methods - API change: in ProfileField, the get*Fields family of methods are now class methods
- API change: 'func' and 'op' are now reserved and not usable as profile fields - API change: 'func' and 'op' are now reserved and not usable as profile fields
- fix: project editing in project management systems not reading fields correctly - fix: project editing in project management systems not reading fields correctly
- fix: JavaScript race condition in dashlet prefs form
- fix: caching problem with overrides in dashlets
7.0.6 7.0.6
- fix: Error in DateTime.pm - fix: Error in DateTime.pm

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

@ -374,13 +374,18 @@ sub getOverridesList {
return $output; return $output;
} }
#-------------------------------------------------------------------
sub _overridesCacheTag {
my $self = shift;
#cache by userId, assetId of this shortcut, and whether adminMode is on or not.
return ["shortcutOverrides", $self->getId, $self->session->user->userId, $self->session->var->get("adminOn")];
}
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub getOverrides { sub getOverrides {
my $self = shift; my $self = shift;
my $i = 0; my $i = 0;
#cache by userId, assetId of this shortcut, and whether adminMode is on or not. my $cache = WebGUI::Cache->new($self->session,$self->_overridesCacheTag);
my $cache = WebGUI::Cache->new($self->session,["shortcutOverrides",$self->getId,$self->session->user->userId,$self->session->var->get("adminOn")]);
my $overridesRef = $cache->get; my $overridesRef = $cache->get;
unless ($overridesRef->{cacheNotExpired}) { unless ($overridesRef->{cacheNotExpired}) {
my %overrides; my %overrides;
@ -412,7 +417,7 @@ sub getOverrides {
my $fieldName = $field->getId; my $fieldName = $field->getId;
my $fieldValue = $u->profileField($field->getId); my $fieldValue = $u->profileField($field->getId);
$overrides{userPrefs}{$fieldName}{value} = $fieldValue; $overrides{userPrefs}{$fieldName}{value} = $fieldValue;
$overrides{overrides}{$fieldName}{parsedValue} = $fieldValue; $overrides{userPrefs}{$fieldName}{parsedValue} = $fieldValue;
# 'myTemplateId is ##userPref:myTemplateId##', for example. # 'myTemplateId is ##userPref:myTemplateId##', for example.
foreach my $overr (keys %{$overrides{overrides}}) { foreach my $overr (keys %{$overrides{overrides}}) {
$overrides{overrides}{$overr}{parsedValue} =~ s/\#\#userPref\:${fieldName}\#\#/$fieldValue/gm; $overrides{overrides}{$overr}{parsedValue} =~ s/\#\#userPref\:${fieldName}\#\#/$fieldValue/gm;
@ -626,13 +631,14 @@ sub processPropertiesFromFormPost {
$self->SUPER::processPropertiesFromFormPost; $self->SUPER::processPropertiesFromFormPost;
my $scratchId = "Shortcut_" . $self->getId; my $scratchId = "Shortcut_" . $self->getId;
$self->session->scratch->delete($scratchId); $self->session->scratch->delete($scratchId);
$self->uncacheOverrides;
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub uncacheOverrides { sub uncacheOverrides {
my $self = shift; my $self = shift;
WebGUI::Cache->new($self->session,["shortcutOverrides",$self->getId])->delete; WebGUI::Cache->new($self->session,$self->_overridesCacheTag)->delete;
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------

6
www/extras/wobject/Dashboard/draggable.js
View file

@ -516,11 +516,11 @@ function dashboard_toggleEditForm(event,shortcutId,shortcutUrl) {
return; return;
} }
// Create the new form element. // Create the new form element.
formDiv = document.createElement("div"); var formDiv = document.createElement("div");
formDiv.id = "form" + shortcutId + "_div"; formDiv.id = "form" + shortcutId + "_div";
formDiv.className = "userPrefsForm"; formDiv.className = "userPrefsForm";
parentDiv = document.getElementById("td" + shortcutId + "_div"); var parentDiv = document.getElementById("td" + shortcutId + "_div");
contentDiv = document.getElementById("ct" + shortcutId + "_div"); var contentDiv = document.getElementById("ct" + shortcutId + "_div");
parentDiv.insertBefore(formDiv,contentDiv); parentDiv.insertBefore(formDiv,contentDiv);
var hooha = AjaxRequest.get( var hooha = AjaxRequest.get(
{ {