提交 7c456751 编写于 作者: L lepdou

update

上级 4da40f9b
...@@ -140,7 +140,7 @@ public class ConfigService { ...@@ -140,7 +140,7 @@ public class ConfigService {
itemDiffs.setDiffs(parseChangeSets(namespace, sourceItems)); itemDiffs.setDiffs(parseChangeSets(namespace, sourceItems));
} catch (BadRequestException e) { } catch (BadRequestException e) {
itemDiffs.setDiffs(new ItemChangeSets()); itemDiffs.setDiffs(new ItemChangeSets());
itemDiffs.setExtInfo("该集群下没有名为#" + namespace.getNamespaceName() + "#的namespace"); itemDiffs.setExtInfo("该集群下没有名为 " + namespace.getNamespaceName() + " 的namespace");
} }
result.add(itemDiffs); result.add(itemDiffs);
} }
......
...@@ -106,14 +106,16 @@ ...@@ -106,14 +106,16 @@
<!--step 2--> <!--step 2-->
<div class="row" ng-show="syncItemStep == 2" ng-repeat="diff in diffs"> <div class="row" ng-show="syncItemStep == 2" ng-repeat="diff in diffs">
<h4 class="text-center"> <h5 class="text-center">
环境:<span ng-bind="diff.namespace.env"></span> 环境:<span ng-bind="diff.namespace.env"></span>
集群:<span ng-bind="diff.namespace.clusterName"></span> 集群:<span ng-bind="diff.namespace.clusterName"></span>
<span ng-show="!diff.extInfo">Namespace:{{pageContext.namespaceName}}</span> <span ng-show="!diff.extInfo">Namespace:{{pageContext.namespaceName}}</span>
<label ng-show="diff.diffs.createItems.length + diff.diffs.updateItems.length == 0">没有更新的配置</label> </h5>
<label ng-show="diff.extInfo" ng-bind="diff.extInfo"></label> <div class="text-center" ng-show="diff.diffs.createItems.length + diff.diffs.updateItems.length == 0 || diff.extInfo">
</h4> <font ng-show="diff.diffs.createItems.length + diff.diffs.updateItems.length == 0 && !diff.extInfo">没有更新的配置</font>
<hr> <font ng-show="diff.extInfo" ng-bind="diff.extInfo"></font>
,忽略同步
</div>
<div class="row" style="margin-top: 10px;" ng-show="diff.diffs.createItems.length > 0"> <div class="row" style="margin-top: 10px;" ng-show="diff.diffs.createItems.length > 0">
<div class="form-horizontal"> <div class="form-horizontal">
...@@ -163,6 +165,7 @@ ...@@ -163,6 +165,7 @@
</div> </div>
</div> </div>
</div> </div>
<hr>
</div> </div>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册