Mercurial > hg > LightPIT / changeset

     1.1 --- a/src/main/java/de/uapcore/lightpit/modules/ProjectsModule.java	Mon Jan 04 15:34:41 2021 +0100
     1.2 +++ b/src/main/java/de/uapcore/lightpit/modules/ProjectsModule.java	Mon Jan 04 17:30:10 2021 +0100
     1.3 @@ -549,8 +549,8 @@
     1.4          }
     1.5  
     1.6          setAttributeFromParameter(req, "more");
     1.7 -        setAttributeFromParameter(req, "component");
     1.8 -        setAttributeFromParameter(req, "version");
     1.9 +        setAttributeFromParameter(req, "cid");
    1.10 +        setAttributeFromParameter(req, "vid");
    1.11  
    1.12          final var issue = new Issue(-1, projectInfo.getProject(), null);
    1.13          issue.setProject(projectInfo.getProject());

     2.1 --- a/src/main/java/de/uapcore/lightpit/viewmodel/ProjectView.java	Mon Jan 04 15:34:41 2021 +0100
     2.2 +++ b/src/main/java/de/uapcore/lightpit/viewmodel/ProjectView.java	Mon Jan 04 17:30:10 2021 +0100
     2.3 @@ -73,14 +73,6 @@
     2.4          return projectInfo != null;
     2.5      }
     2.6  
     2.7 -    public boolean isVersionFilterValid() {
     2.8 -        return projectInfo != null && versionFilter != null;
     2.9 -    }
    2.10 -
    2.11 -    public boolean isComponentFilterValid() {
    2.12 -        return projectInfo != null && componentFilter != null;
    2.13 -    }
    2.14 -
    2.15      public boolean isEveryFilterValid() {
    2.16          return projectInfo != null && versionFilter != null && componentFilter != null;
    2.17      }

     3.1 --- a/src/main/webapp/WEB-INF/jsp/issue-form.jsp	Mon Jan 04 15:34:41 2021 +0100
     3.2 +++ b/src/main/webapp/WEB-INF/jsp/issue-form.jsp	Mon Jan 04 17:30:10 2021 +0100
     3.3 @@ -87,6 +87,7 @@
     3.4                      <c:forEach var="component" items="${viewmodel.components}">
     3.5                          <option
     3.6                                  <c:if test="${not empty issue.component and component eq issue.component}">selected</c:if>
     3.7 +                                <c:if test="${empty issue.component and component.id eq cid}">selected</c:if>
     3.8                                  value="${component.id}"><c:out value="${component.name}"/></option>
     3.9                      </c:forEach>
    3.10                  </select>

     4.1 --- a/src/main/webapp/WEB-INF/jsp/project-details.jsp	Mon Jan 04 15:34:41 2021 +0100
     4.2 +++ b/src/main/webapp/WEB-INF/jsp/project-details.jsp	Mon Jan 04 17:30:10 2021 +0100
     4.3 @@ -27,6 +27,7 @@
     4.4  <%@page pageEncoding="UTF-8" import="de.uapcore.lightpit.viewmodel.ProjectView" %>
     4.5  <%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
     4.6  <%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
     4.7 +<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
     4.8  
     4.9  <jsp:useBean id="viewmodel" type="de.uapcore.lightpit.viewmodel.ProjectDetailsView" scope="request" />
    4.10  
    4.11 @@ -35,7 +36,17 @@
    4.12  <%@include file="../jspf/project-header.jspf"%>
    4.13  
    4.14  <div id="tool-area">
    4.15 -    <a href="./projects/${project.node}/create-issue" class="button"><fmt:message key="button.issue.create"/></a>
    4.16 +    <c:remove var="createIssueParams"/>
    4.17 +    <c:if test="${viewmodel.versionFilter.id gt 0}">
    4.18 +        <c:set var="createIssueParams">&vid=${viewmodel.versionFilter.id}</c:set>
    4.19 +    </c:if>
    4.20 +    <c:if test="${viewmodel.componentFilter.id gt 0}">
    4.21 +        <c:set var="createIssueParams">${createIssueParams}&cid=${viewmodel.componentFilter.id}</c:set>
    4.22 +    </c:if>
    4.23 +    <c:if test="${not empty createIssueParams}">
    4.24 +        <c:set var="createIssueParams">?${fn:substringAfter(createIssueParams, "&")}</c:set>
    4.25 +    </c:if>
    4.26 +    <a href="./projects/${project.node}/create-issue${createIssueParams}" class="button"><fmt:message key="button.issue.create"/></a>
    4.27      <c:if test="${viewmodel.versionFilter.id gt 0}">
    4.28          <a href="./projects/${project.node}/versions/${viewmodel.versionFilter.node}/edit" class="button"><fmt:message key="button.version.edit"/></a>
    4.29      </c:if>

     5.1 --- a/src/main/webapp/WEB-INF/jspf/version-list.jspf	Mon Jan 04 15:34:41 2021 +0100
     5.2 +++ b/src/main/webapp/WEB-INF/jspf/version-list.jspf	Mon Jan 04 17:30:10 2021 +0100
     5.3 @@ -6,6 +6,7 @@
     5.4                  <c:forEach var="v" items="${data}">
     5.5                      <c:if test="${v eq vselitem}">selected</c:if>
     5.6                  </c:forEach>
     5.7 +                <c:if test="${vid eq vselitem.id}">selected</c:if>
     5.8          >
     5.9              <c:out value="${vselitem.name}" />
    5.10          </option>