Update the development progress

Author: haiphucnguyen

mycollab-dao/src/main/java/org/mybatis/scripting/velocity/IfEqualsBlock.kt

@@ -0,0 +1,52 @@
+package org.mybatis.scripting.velocity
+
+import org.apache.velocity.context.InternalContextAdapter
+import org.apache.velocity.exception.MethodInvocationException
+import org.apache.velocity.exception.ParseErrorException
+import org.apache.velocity.exception.ResourceNotFoundException
+import org.apache.velocity.runtime.directive.Directive
+import org.apache.velocity.runtime.directive.DirectiveConstants
+import org.apache.velocity.runtime.parser.node.Node
+import java.io.IOException
+import java.io.Writer
+
+/**
+ * @author MyCollab Ltd
+ * @since 7.0.2
+ */
+class IfEqualsBlock : Directive() {
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.velocity.runtime.directive.Directive#getName()
+ */
+ override fun getName(): String = "ifequals"
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.velocity.runtime.directive.Directive#getType()
+ */
+ override fun getType(): Int = DirectiveConstants.BLOCK
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.apache.velocity.runtime.directive.Directive#render(org.apache.velocity
+ * .context.InternalContextAdapter, java.io.Writer,
+ * org.apache.velocity.runtime.parser.node.Node)
+ */
+ @Throws(IOException::class, ResourceNotFoundException::class, ParseErrorException::class, MethodInvocationException::class)
+ override fun render(context: InternalContextAdapter, writer: Writer, node: Node): Boolean {
+ val param0 = node.jjtGetChild(0).value(context)
+ val param1 = node.jjtGetChild(1).value(context)
+ if (param0 == param1) {
+ val content = node.jjtGetChild(2)
+ content.render(context, writer)
+ }
+ return true
+ }
+
+}

mycollab-dao/src/main/resources/mybatis-velocity.properties

@@ -1,4 +1,4 @@
 userdirective=org.mybatis.scripting.velocity.Ifnotnull,org.mybatis.scripting.velocity.Ifnull,org.mybatis.scripting\
  .velocity.NoValExpr,org.mybatis.scripting.velocity.OneValExpr,org.mybatis.scripting.velocity.CollectionValExpr,org\
  .mybatis.scripting.velocity.CompositionValExpr,org.mybatis.scripting.velocity.BetweenValExpr,org.mybatis.scripting\
- .velocity.TrimExtDirective,org.mybatis.scripting.velocity.Equals
+ .velocity.TrimExtDirective,org.mybatis.scripting.velocity.Equals,org.mybatis.scripting.velocity.IfEqualsBlock

mycollab-localization/src/main/java/com/mycollab/module/project/i18n/BugI18nEnum.java

@@ -57,13 +57,11 @@ public enum BugI18nEnum {
  FORM_RESOLVED_DATE,
  FORM_ANY_TEXT,
 
- OPT_BUG_DEPENDENCIES,
  OPT_APPROVE_BUG,
  OPT_ASSIGN_BUG,
  OPT_REOPEN_BUG,
  OPT_RESOLVE_BUG,
  OPT_EDIT_BUG_NAME,
- OPT_REMOVE_RELATIONSHIP,
 
  VAL_ALL_BUGS,
  VAL_ALL_OPEN_BUGS,

mycollab-localization/src/main/java/com/mycollab/module/project/i18n/OptionI18nEnum.java

@@ -68,9 +68,9 @@ public enum BugResolution {
  None
  }
 
- @BaseName("project-bug-related")
+ @BaseName("project-ticket-relation")
  @LocaleData(value = {@Locale("en-US")}, defaultCharset = "UTF-8")
- public enum BugRelation {
+ public enum TicketRel {
  Related, Duplicated, Block, DependsOn, Duplicate, Relation;
 
  public Enum getReverse() {

mycollab-localization/src/main/java/com/mycollab/module/project/i18n/TicketI18nEnum.java

@@ -49,5 +49,8 @@ public enum TicketI18nEnum {
  FORM_AFFECTED_VERSIONS,
  FORM_COMPONENTS_HELP,
  FORM_COMPONENTS,
- FORM_AFFECTED_VERSIONS_HELP
+ FORM_AFFECTED_VERSIONS_HELP,
+
+ OPT_REMOVE_RELATIONSHIP,
+ OPT_DEPENDENCIES
 }