Commit 05a3229e authored by Jason Song's avatar Jason Song Committed by GitHub

fix #2167 (#2172)

parent 2ec5d6ea
...@@ -191,14 +191,15 @@ function directive($window, toastr, AppUtil, EventManager, PermissionService, Na ...@@ -191,14 +191,15 @@ function directive($window, toastr, AppUtil, EventManager, PermissionService, Na
//modify master item and set item's masterReleaseValue //modify master item and set item's masterReleaseValue
if (masterItem) { if (masterItem) {
if (masterItem.isModified && masterItem.oldValue) { item.masterItemExists = true;
if (masterItem.isModified) {
item.masterReleaseValue = masterItem.oldValue; item.masterReleaseValue = masterItem.oldValue;
} else if (masterItem.item.value) { } else {
item.masterReleaseValue = masterItem.item.value; item.masterReleaseValue = masterItem.item.value;
} }
} else {//delete branch item } else {//delete branch item
item.masterReleaseValue = ''; item.masterItemExists = false;
} }
//delete master item. ignore //delete master item. ignore
......
...@@ -155,10 +155,10 @@ ...@@ -155,10 +155,10 @@
<span ng-bind="config.item.key.length > 250 ? '...' :''"></span> <span ng-bind="config.item.key.length > 250 ? '...' :''"></span>
<span class="label label-danger" ng-if="config.isDeleted" <span class="label label-danger" ng-if="config.isDeleted"
data-tooltip="tooltip" data-placement="bottom" title="删除的配置"></span> data-tooltip="tooltip" data-placement="bottom" title="删除的配置"></span>
<span class="label label-info" ng-if="!config.isDeleted && config.masterReleaseValue" <span class="label label-info" ng-if="!config.isDeleted && config.masterItemExists"
data-tooltip="tooltip" data-placement="bottom" title="修改主版本的配置"></span> data-tooltip="tooltip" data-placement="bottom" title="修改主版本的配置"></span>
<span class="label label-success" <span class="label label-success"
ng-if="!config.isDeleted && !config.masterReleaseValue" ng-if="!config.isDeleted && !config.masterItemExists"
data-tooltip="tooltip" data-placement="bottom" title="灰度版本特有的配置"></span> data-tooltip="tooltip" data-placement="bottom" title="灰度版本特有的配置"></span>
</td> </td>
<td width="20%" class="cursor-pointer" title="点击查看" <td width="20%" class="cursor-pointer" title="点击查看"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment