Commit eb6af6f0 by lepdou

update

parent 1f93272b
...@@ -88,7 +88,7 @@ public class ItemController { ...@@ -88,7 +88,7 @@ public class ItemController {
@RequestParam(defaultValue = "lineNum") String orderBy){ @RequestParam(defaultValue = "lineNum") String orderBy){
List<ItemDTO> items = configService.findItems(appId, Env.valueOf(env), clusterName, namespaceName); List<ItemDTO> items = configService.findItems(appId, Env.valueOf(env), clusterName, namespaceName);
if ("lastModifyTime".equals(orderBy)){ if ("lastModifiedTime".equals(orderBy)){
Collections.sort(items, (o1, o2) -> { Collections.sort(items, (o1, o2) -> {
if (o1.getDataChangeLastModifiedTime().after(o2.getDataChangeLastModifiedTime())){ if (o1.getDataChangeLastModifiedTime().after(o2.getDataChangeLastModifiedTime())){
return -1; return -1;
......
...@@ -16,7 +16,7 @@ sync_item_module.controller("SyncItemController", ...@@ -16,7 +16,7 @@ sync_item_module.controller("SyncItemController",
ConfigService.find_items($scope.pageContext.appId, $scope.pageContext.env, ConfigService.find_items($scope.pageContext.appId, $scope.pageContext.env,
$scope.pageContext.clusterName, $scope.pageContext.clusterName,
$scope.pageContext.namespaceName, $scope.pageContext.namespaceName,
"lastModifyTime") "lastModifiedTime")
.then(function (result) { .then(function (result) {
$scope.sourceItems = []; $scope.sourceItems = [];
......
<div class="panel" style="border-top: 0px;"> <div class="panel" style="border-top: 0px;">
<div class="row namespace-attribute-panel" ng-if="namespace.isPublic"> <div class="row namespace-attribute-panel" ng-if="namespace.isPublic">
<div class="text-center namespace-attribute-public" data-tooltip="tooltip" data-placement="bottom" <div class="text-center namespace-attribute-public">
title="点击跳转到公共Namespace"> <span data-tooltip="tooltip" data-placement="bottom" title="公共的Namespace"
<span ng-show="namespace.parentAppId == namespace.baseInfo.appId">公共</span> ng-show="namespace.parentAppId == namespace.baseInfo.appId">公共</span>
<span ng-show="namespace.parentAppId != namespace.baseInfo.appId" <span data-tooltip="tooltip" data-placement="bottom" title="点击跳转到公共的Namespace"
ng-show="namespace.parentAppId != namespace.baseInfo.appId"
ng-click="goToParentAppConfigPage(namespace)">关联</span> ng-click="goToParentAppConfigPage(namespace)">关联</span>
</div> </div>
</div> </div>
......
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