Mercurial > hg > LightPIT / changeset

     1.1 --- a/src/main/java/de/uapcore/lightpit/modules/ProjectsModule.java	Sat Oct 24 12:09:08 2020 +0200
     1.2 +++ b/src/main/java/de/uapcore/lightpit/modules/ProjectsModule.java	Sat Oct 31 09:15:57 2020 +0100
     1.3 @@ -298,7 +298,7 @@
     1.4              return ResponseType.NONE;
     1.5          }
     1.6  
     1.7 -        viewModel.setVersion(viewModel.getVersionFilter());
     1.8 +        viewModel.setVersion(new Version(-1));
     1.9  
    1.10          return forwardView(req, viewModel, "version-form");
    1.11      }

     2.1 --- a/src/main/kotlin/de/uapcore/lightpit/entities/Component.kt	Sat Oct 24 12:09:08 2020 +0200
     2.2 +++ b/src/main/kotlin/de/uapcore/lightpit/entities/Component.kt	Sat Oct 31 09:15:57 2020 +0100
     2.3 @@ -28,8 +28,8 @@
     2.4  import de.uapcore.lightpit.types.WebColor
     2.5  
     2.6  data class Component(val id: Int) {
     2.7 -    var name: String? = null
     2.8 -    var node: String? = null
     2.9 +    var name: String = ""
    2.10 +    var node: String = name
    2.11      var color = WebColor("000000")
    2.12      var ordinal = 0
    2.13      var description: String? = null

     3.1 --- a/src/main/kotlin/de/uapcore/lightpit/entities/Version.kt	Sat Oct 24 12:09:08 2020 +0200
     3.2 +++ b/src/main/kotlin/de/uapcore/lightpit/entities/Version.kt	Sat Oct 31 09:15:57 2020 +0100
     3.3 @@ -31,13 +31,13 @@
     3.4  }
     3.5  
     3.6  data class Version(val id: Int) : Comparable<Version> {
     3.7 -    var name: String = "unspecified"
     3.8 +    var name: String = ""
     3.9      var node = name
    3.10      var ordinal = 0
    3.11      var status = VersionStatus.Future
    3.12  
    3.13      override fun compareTo(other: Version): Int {
    3.14 -        val ord = Integer.compare(ordinal, other.ordinal)
    3.15 +        val ord = ordinal.compareTo(other.ordinal)
    3.16          return if (ord == 0) {
    3.17              name.compareTo(other.name, ignoreCase = true)
    3.18          } else {

     4.1 --- a/src/main/webapp/WEB-INF/jsp/component-form.jsp	Sat Oct 24 12:09:08 2020 +0200
     4.2 +++ b/src/main/webapp/WEB-INF/jsp/component-form.jsp	Sat Oct 31 09:15:57 2020 +0100
     4.3 @@ -52,7 +52,7 @@
     4.4          </tr>
     4.5          <tr title="<fmt:message key="node.tooltip"/>">
     4.6              <th><fmt:message key="node"/></th>
     4.7 -            <td><input name="node" type="text" maxlength="20" required value="<c:out value="${component.node}"/>" /></td>
     4.8 +            <td><input name="node" type="text" maxlength="20" value="<c:out value="${component.node}"/>" /></td>
     4.9          </tr>
    4.10          <tr>
    4.11              <th><fmt:message key="component.color"/></th>

     5.1 --- a/src/main/webapp/WEB-INF/jsp/project-form.jsp	Sat Oct 24 12:09:08 2020 +0200
     5.2 +++ b/src/main/webapp/WEB-INF/jsp/project-form.jsp	Sat Oct 31 09:15:57 2020 +0100
     5.3 @@ -44,7 +44,7 @@
     5.4          </tr>
     5.5          <tr title="<fmt:message key="node.tooltip"/>">
     5.6              <th><fmt:message key="node"/></th>
     5.7 -            <td><input name="node" type="text" maxlength="20" required value="<c:out value="${project.node}"/>" /></td>
     5.8 +            <td><input name="node" type="text" maxlength="20" value="<c:out value="${project.node}"/>" /></td>
     5.9          </tr>
    5.10          <tr>
    5.11              <th><fmt:message key="description"/></th>

     6.1 --- a/src/main/webapp/WEB-INF/jsp/version-form.jsp	Sat Oct 24 12:09:08 2020 +0200
     6.2 +++ b/src/main/webapp/WEB-INF/jsp/version-form.jsp	Sat Oct 31 09:15:57 2020 +0100
     6.3 @@ -52,7 +52,7 @@
     6.4          </tr>
     6.5          <tr title="<fmt:message key="node.tooltip"/>">
     6.6              <th><fmt:message key="node"/></th>
     6.7 -            <td><input name="node" type="text" maxlength="20" required value="<c:out value="${version.node}"/>" /></td>
     6.8 +            <td><input name="node" type="text" maxlength="20" value="<c:out value="${version.node}"/>" /></td>
     6.9          </tr>
    6.10          <tr>
    6.11              <th><fmt:message key="version.status"/></th>