Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[NIFI-2831] update auto terminate messages. This closes #1077

This commit is contained in:
Scott Aslan 2016-09-28 12:21:21 -04:00 committed by Matt Gilman
parent 12e3315ae9
commit 1a24f5f34c
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardProcessorDAO.java
View File

@ -278,7 +278,7 @@ public class StandardProcessorDAO extends ComponentDAO implements ProcessorDAO {
final Relationship relationship = new Relationship.Builder().name(relationshipName).build(); final Relationship relationship = new Relationship.Builder().name(relationshipName).build();
final Set<Connection> connections = processorNode.getConnections(relationship); final Set<Connection> connections = processorNode.getConnections(relationship);
if (isNotNull(connections) && !connections.isEmpty()) { if (isNotNull(connections) && !connections.isEmpty()) {
validationErrors.add("Cannot Auto-Terminate '" + relationshipName + "' relationship because a Connection already exists with this relationship"); validationErrors.add("Cannot automatically terminate '" + relationshipName + "' relationship because a Connection already exists with this relationship");
} }
} }
} }

2
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/processor-configuration.jsp
View File

@ -81,7 +81,7 @@
<div class="settings-right"> <div class="settings-right">
<div class="setting"> <div class="setting">
<div class="setting-name"> <div class="setting-name">
Auto terminate relationships Automatically terminate relationships
<div class="fa fa-question-circle" alt="Info" title="Will automatically terminate FlowFiles sent to a given relationship if it is not defined elsewhere."></div> <div class="fa fa-question-circle" alt="Info" title="Will automatically terminate FlowFiles sent to a given relationship if it is not defined elsewhere."></div>
</div> </div>
<div class="setting-field"> <div class="setting-field">

2
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/processor-details.jsp
View File

@ -79,7 +79,7 @@
<div class="settings-right"> <div class="settings-right">
<div class="setting"> <div class="setting">
<div class="setting-name"> <div class="setting-name">
Auto terminate relationships Automatically terminate relationships
<div class="fa fa-question-circle" alt="Info" title="Will automatically terminate FlowFiles sent to all relationships in bold."></div> <div class="fa fa-question-circle" alt="Info" title="Will automatically terminate FlowFiles sent to all relationships in bold."></div>
</div> </div>
<div class="setting-field"> <div class="setting-field">