Add a template variable to hide the subscribe form when editing a Pos…

…t when the user is subscribed to the parent CS. Updated all PostForm templates to use this new variable. Fixes bug #11626.
plainblack · Jun 22, 2010 · 4f6fa4e · 4f6fa4e
1 parent 8145061
commit 4f6fa4e
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 0 deletions.
diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
@@ -10,6 +10,7 @@
  - fixed #11658: tmpl var message missing in template help for the cart
  - fixed #11628: Message Board: Last Post doesn't show up in CS Thread List
  - fixed #11646: Post and Thread Last Post
+ - fixed #11626: Duplicate messages from Collab Systems
 
 7.8.21
  - fixed #11597: manageTrash and newlines

diff --git a/docs/upgrades/packages-7.9.8/root_import_collaboration.wgpkg b/docs/upgrades/packages-7.9.8/root_import_collaboration.wgpkg
diff --git a/lib/WebGUI/Asset/Post.pm b/lib/WebGUI/Asset/Post.pm
@@ -1673,6 +1673,7 @@ sub www_edit {
     $var{'archive.form'} = WebGUI::Form::yesNo($session, {
         name=>"archive"
     });
+    $var{'isSubscribedToCs'} = $self->getThread->getParent->isSubscribed;
 	$var{'form.header'} .= WebGUI::Form::hidden($session, {
         name=>"proceed", 
         value=>"showConfirmation"

diff --git a/lib/WebGUI/Help/Asset_Post.pm b/lib/WebGUI/Help/Asset_Post.pm
@@ -27,6 +27,7 @@ our $HELP = {
             { 'name' => 'reply.synopsis' },
             { 'name' => 'reply.content' },
             { 'name' => 'reply.userDefinedN' },
+            { 'name' => 'isSubscribedToCs' },
             { 'name' => 'subscribe.form' },
             { 'name' => 'isNewThread' },
             { 'name' => 'archive.form' },

diff --git a/lib/WebGUI/i18n/English/Asset_Post.pm b/lib/WebGUI/i18n/English/Asset_Post.pm
@@ -48,6 +48,12 @@ editing an existing Post.|,
 		lastUpdated => 1149829706,
 	},
 
+	'isSubscribedToCs' => {
+		message => q|A boolean which will be true if the current user is subscribed to the CS containing this Post.|,
+        context => q|Template variable description|,
+		lastUpdated => 1149829706,
+	},
+
 	'subscribe.form' => {
 		message => q|A yes/no button to allow the user to subscribe to the thread this post belongs to.|,
 		lastUpdated => 1149829706,