[Rt-commit] rt branch, 4.4/optional-articles-ticket-linking, created. rt-4.4.3-80-g20d5641e1

[Maureen Mirville]

The branch, 4.4/optional-articles-ticket-linking has been created
        at  20d5641e12d5844abb0444e97b59ce40ad3feb83 (commit)

- Log -----------------------------------------------------------------
commit 3283397ad4d306153bf8f1c5aa8bf46b103b73f7
Author: Maureen E. Mirville <maureen at bestpractical.com>
Date:   Thu Dec 6 01:47:48 2018 -0500

    Add option to disable ticket linking in articles by class

diff --git a/share/html/Admin/Articles/Classes/Modify.html b/share/html/Admin/Articles/Classes/Modify.html
index f69a1601d..2bf492ad6 100644
--- a/share/html/Admin/Articles/Classes/Modify.html
+++ b/share/html/Admin/Articles/Classes/Modify.html
@@ -84,6 +84,10 @@
 
 <h3><&|/l&>When inserting articles in this class into emails:</&></h3>
 <ul>
+<li>
+    <input type="checkbox" id="Include-TicketLinking" name="Include-TicketLinking" value="1" <% $include{TicketLinking} %>>
+    <label for="Include-TicketLinking"><&|/l&>Link article to ticket</&></label>
+</li>
 <li>
     <input type="checkbox" id="Include-Name" name="Include-Name" value="1" <% $include{Name} %>>
     <label for="Include-Name"><&|/l&>Include article name</&></label>
@@ -191,7 +195,7 @@ if ((defined $Enabled && $Enabled == 1) or (not defined $Enabled and $Create)) {
     $Disabled = 1;
 }
 
-my %include = (Name => 1, Summary => 1, EscapeHTML => 1);
+my %include = ( Name => 1, Summary => 1, EscapeHTML => 1, TicketLinking => 1 );
 my $subject_cfs = [];
 my $subject_cf_labels = {};
 
diff --git a/share/html/Articles/Elements/BeforeMessageBox b/share/html/Articles/Elements/BeforeMessageBox
index 8c84eb102..259001f4e 100644
--- a/share/html/Articles/Elements/BeforeMessageBox
+++ b/share/html/Articles/Elements/BeforeMessageBox
@@ -164,7 +164,7 @@ if ( $ARGS{id} && $ARGS{id} ne 'new' ) {
             Field => substr($arg, length($name_prefix)),
             Value => $ARGS{$arg},
         );
-        if ($article->Id) {
+        if ($article->Id and not $article->ClassObj->FirstAttribute('Skip-TicketLinking')) {
             $uri{$article->URI}++;
         }
     }

commit 20d5641e12d5844abb0444e97b59ce40ad3feb83
Author: Maureen E. Mirville <maureen at bestpractical.com>
Date:   Thu Dec 6 02:13:25 2018 -0500

    Remove unused set page title fallback code for article classes

diff --git a/share/html/Admin/Articles/Classes/Modify.html b/share/html/Admin/Articles/Classes/Modify.html
index 2bf492ad6..28eeeee8b 100644
--- a/share/html/Admin/Articles/Classes/Modify.html
+++ b/share/html/Admin/Articles/Classes/Modify.html
@@ -164,10 +164,6 @@ if ($Create) {
     if ( $val ) {
         $title = loc('Modify the Class [_1]', $ClassObj->Name);
     }
-    else {
-        $title = loc("Create a Class");
-        $Create = 1;
-    }
 }
 
 if ($ClassObj->Id()) {

-----------------------------------------------------------------------