minor bug fixes

MyCollab · Apr 19, 2016 · d1b831c · d1b831c
1 parent e29efb7
commit d1b831c
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/mycollab-esb/src/main/resources/templates/email/project/memberInvitationNotifier_en_US.mt b/mycollab-esb/src/main/resources/templates/email/project/memberInvitationNotifier_en_US.mt
@@ -17,7 +17,27 @@ a {
             <div style="color: rgb(167, 221, 249); font-size: 35px; line-height: 10px; text-align: right;">&bdquo;</div>
         </div>
     #end
-
+
+    #macro( linkBlock $webLink $displayName)
+        <table style="width: auto; border-collapse: collapse; margin: 10px auto">
+            <tbody>
+                <tr>
+                    <td>
+                        <div style="border: 1px solid ${styles.border_color}; border-radius: 3px">
+                            <table style="width: auto; border-collapse: collapse">
+                                <tr>
+                                    <td style="font: 14px/1.4285714 Arial, sans-serif; padding: 4px 10px; background-color: ${styles.action_color}">
+                                        <a href="$webLink" style="color: white; text-decoration: none; font-weight: bold">$displayName</a>
+                                    </td>
+                                </tr>
+                            </table>
+                        </div>
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+    #end
+
     <table width="600" cellpadding="0" cellspacing="0" border="0" style="margin: 20px auto;">
         #parse("templates/email/logo.mt")
         <tr>

diff --git a/...ion/V20160413_1__Clean_Timeline_Cache.sql → ...ion/V20160414_1__Clean_Timeline_Cache.sql b/...ion/V20160413_1__Clean_Timeline_Cache.sql → ...ion/V20160414_1__Clean_Timeline_Cache.sql
@@ -1,3 +1,3 @@
 DELETE FROM `s_timeline_tracking_cache` WHERE id > 0;
 ALTER TABLE `m_options` ADD COLUMN `isShow` BIT(1) NULL;
-UPDATE `m_tracker_bug` SET `status` = 'ReOpen' WHERE `status` = 'ReOpened' AND id > 0
+UPDATE `m_tracker_bug` SET `status` = 'ReOpen' WHERE `status` = 'ReOpened' AND id > 0;