From 970294d618056add9558a8b962dc4c7194dd3129 Mon Sep 17 00:00:00 2001
From: Graham Knop <graham@plainblack.com>
Date: Tue, 1 Apr 2008 14:42:04 +0000
Subject: [PATCH] fixed: edit branch sends thread notifications fixed: changing
 style template with edit branch creates new revisions of assets that have no
 style template

---
 docs/changelog/7.x.x.txt  |  2 ++
 lib/WebGUI/AssetBranch.pm | 19 +++++++++++++++----
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 67028b2b1..2edd06438 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -12,6 +12,8 @@
  - fixed: Project Manager can't track non-integer durations
  - fixed: Unable to edit CS posts that were denied as a normal user
  - added: Better error messages when SQL Report lacks a query (William McKee, Knowmad Technologies)
+ - fixed: edit branch sends thread notifications
+ - fixed: changing style template with edit branch creates new revisions of assets that have no style template
 
 7.5.8
  - moved Gallery utility methods to WebGUI::Utility::Gallery
diff --git a/lib/WebGUI/AssetBranch.pm b/lib/WebGUI/AssetBranch.pm
index 3523793b5..7a1743a53 100644
--- a/lib/WebGUI/AssetBranch.pm
+++ b/lib/WebGUI/AssetBranch.pm
@@ -243,14 +243,18 @@ sub www_editBranchSave {
 	my %data;
 	$data{isHidden} = $self->session->form->yesNo("isHidden") if ($self->session->form->yesNo("change_isHidden"));
 	$data{newWindow} = $self->session->form->yesNo("newWindow") if ($self->session->form->yesNo("change_newWindow"));
-	$data{displayTitle} = $self->session->form->yesNo("displayTitle") if ($self->session->form->yesNo("change_displayTitle"));
-	$data{styleTemplateId} = $self->session->form->template("styleTemplateId") if ($self->session->form->yesNo("change_styleTemplateId"));
-	$data{printableStyleTemplateId} = $self->session->form->template("printableStyleTemplateId") if ($self->session->form->yesNo("change_printableStyleTemplateId"));
 	$data{encryptPage} = $self->session->form->yesNo("encryptPage") if ($self->session->form->yesNo("change_encryptPage"));
 	$data{ownerUserId} = $self->session->form->selectBox("ownerUserId") if ($self->session->form->yesNo("change_ownerUserId"));
 	$data{groupIdView} = $self->session->form->group("groupIdView") if ($self->session->form->yesNo("change_groupIdView"));
 	$data{groupIdEdit} = $self->session->form->group("groupIdEdit") if ($self->session->form->yesNo("change_groupIdEdit"));
 	$data{extraHeadTags} = $self->session->form->group("extraHeadTags") if ($self->session->form->yesNo("change_extraHeadTags"));
+    my %wobjectData = %data;
+    $wobjectData{displayTitle} = $self->session->form->yesNo("displayTitle")
+        if ($self->session->form->yesNo("change_displayTitle"));
+    $wobjectData{styleTemplateId} = $self->session->form->template("styleTemplateId")
+        if ($self->session->form->yesNo("change_styleTemplateId"));
+    $wobjectData{printableStyleTemplateId} = $self->session->form->template("printableStyleTemplateId")
+        if ($self->session->form->yesNo("change_printableStyleTemplateId"));
 	my ($urlBaseBy, $urlBase, $endOfUrl);
 	my $changeUrl = $self->session->form->yesNo("change_url");
 	if ($changeUrl) {
@@ -279,7 +283,14 @@ sub www_editBranchSave {
 				$data{url} .= $descendant->get("url");
 			}
 		}
-        my $newRevision = $descendant->addRevision(\%data, undef, {skipAutoCommitWorkflows=>1});
+        my $newData = $descendant->isa('WebGUI::Asset::Wobject') ? \%wobjectData : \%data;
+        next
+            if (scalar %$newData == 0);
+        my $newRevision = $descendant->addRevision(
+            $newData,
+            undef,
+            {skipAutoCommitWorkflows => 1, skipNotification => 1},
+        );
 		foreach my $form ($self->session->form->param) {
                 	if ($form =~ /^metadata_(.*)$/) {
 				my $fieldName = $1;