Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix #2167 #2172

Merged
merged 1 commit into from
Apr 27, 2019
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
fix #2167
nobodyiam committed Apr 27, 2019
commit 3b28fc7d73e5f0e6a53de1156933a2d9bf32ff47
Original file line number Diff line number Diff line change
@@ -191,14 +191,15 @@ function directive($window, toastr, AppUtil, EventManager, PermissionService, Na

//modify master item and set item's masterReleaseValue
if (masterItem) {
if (masterItem.isModified && masterItem.oldValue) {
item.masterItemExists = true;
if (masterItem.isModified) {
item.masterReleaseValue = masterItem.oldValue;
} else if (masterItem.item.value) {
} else {
item.masterReleaseValue = masterItem.item.value;
}

} else {//delete branch item
item.masterReleaseValue = '';
item.masterItemExists = false;
}

//delete master item. ignore
Original file line number Diff line number Diff line change
@@ -155,10 +155,10 @@
<span ng-bind="config.item.key.length > 250 ? '...' :''"></span>
<span class="label label-danger" ng-if="config.isDeleted"
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>
<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>
</td>
<td width="20%" class="cursor-pointer" title="点击查看"