Merge lp:~slub.team/goobi-production/bug-1072756 into lp:goobi-production/1.8

Proposed by Henning Gerhardt
Status: Merged
Merge reported by: Ralf Claussnitzer
Merged at revision: not available
Proposed branch: lp:~slub.team/goobi-production/bug-1072756
Merge into: lp:goobi-production/1.8
Diff against target: 45 lines (+7/-11)
1 file modified
newpages/ProzessverwaltungBearbeiten.jsp (+7/-11)
To merge this branch: bzr merge lp:~slub.team/goobi-production/bug-1072756
Reviewer Review Type Date Requested Status
Ralf Claussnitzer (community) Approve
Matthias Ronge (community) test Approve
Review via email: mp+132102@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Matthias Ronge (matthias-ronge) wrote :

Works for me :)

review: Approve (test)
Revision history for this message
Ralf Claussnitzer (ralf-claussnitzer-deactivatedaccount) wrote :

Ok.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'newpages/ProzessverwaltungBearbeiten.jsp'
--- newpages/ProzessverwaltungBearbeiten.jsp 2012-09-21 09:51:52 +0000
+++ newpages/ProzessverwaltungBearbeiten.jsp 2012-10-30 13:39:27 +0000
@@ -5,7 +5,6 @@
5<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="x"%>5<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="x"%>
6<%@ taglib uri="https://ajax4jsf.dev.java.net/ajax" prefix="a4j"%>6<%@ taglib uri="https://ajax4jsf.dev.java.net/ajax" prefix="a4j"%>
77
8<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
9<%--8<%--
10 ~ This file is part of the Goobi Application - a Workflow tool for the support of9 ~ This file is part of the Goobi Application - a Workflow tool for the support of
11 ~ mass digitization.10 ~ mass digitization.
@@ -73,12 +72,10 @@
73 <%-- Prozessdetails --%>72 <%-- Prozessdetails --%>
74 <%@include file="inc_Prozessverwaltung/prozess_box_Prozessdetails.jsp"%>73 <%@include file="inc_Prozessverwaltung/prozess_box_Prozessdetails.jsp"%>
7574
76 <%-- Schritte --%>75 <f:subview id="sub001" rendered="#{ProzessverwaltungForm.myProzess.id != null}">
77 <c:if test="${ProzessverwaltungForm.myProzess.id != null}">76 <%-- Schritte --%>
78 <%@include file="inc_Prozessverwaltung/prozess_box_Schritte.jsp"%>77 <%@include file="inc_Prozessverwaltung/prozess_box_Schritte.jsp"%>
79 </c:if>
8078
81 <f:subview id="sub001" rendered="#{ProzessverwaltungForm.myProzess.id != null && not ProzessverwaltungForm.myProzess.istTemplate}">
82 <%-- Vorlagen --%>79 <%-- Vorlagen --%>
83 <f:subview id="subVorlage" rendered="#{ProzessverwaltungForm.myProzess.vorlagenSize != 0}">80 <f:subview id="subVorlage" rendered="#{ProzessverwaltungForm.myProzess.vorlagenSize != 0}">
84 <%@include file="inc_Prozessverwaltung/prozess_box_Vorlagen.jsp"%>81 <%@include file="inc_Prozessverwaltung/prozess_box_Vorlagen.jsp"%>
@@ -88,13 +85,12 @@
88 <f:subview id="subWerk" rendered="#{ProzessverwaltungForm.myProzess.werkstueckeSize != 0}">85 <f:subview id="subWerk" rendered="#{ProzessverwaltungForm.myProzess.werkstueckeSize != 0}">
89 <%@include file="inc_Prozessverwaltung/prozess_box_Werkstuecke.jsp"%>86 <%@include file="inc_Prozessverwaltung/prozess_box_Werkstuecke.jsp"%>
90 </f:subview>87 </f:subview>
88
89 <%-- Prozesseigenschaften --%>
90 <%@include file="inc_Prozessverwaltung/prozess_box_Prozesseigenschaften.jsp"%>
91
91 </f:subview>92 </f:subview>
9293
93 <%-- Prozesseigenschaften --%>
94 <c:if test="${ProzessverwaltungForm.myProzess.id != null}">
95 <%@include file="inc_Prozessverwaltung/prozess_box_Prozesseigenschaften.jsp"%>
96 </c:if>
97
98 </htm:td>94 </htm:td>
99 </htm:tr>95 </htm:tr>
100 </htm:table>96 </htm:table>

Subscribers

People subscribed via source and target branches

to all changes: