Merge branch 'master' of github.com:ctripcorp/apollo

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/ItemSetService.java

@@ -50,6 +50,9 @@ public class ItemSetService {
         Item entity = BeanUtils.transfrom(Item.class, item);
 
         Item beforeUpdateItem = itemService.findOne(entity.getId());
+        if (beforeUpdateItem != null){
+          beforeUpdateItem = BeanUtils.transfrom(Item.class, beforeUpdateItem);
+        }
 
         entity.setDataChangeLastModifiedBy(operator);
         Item updatedItem = itemService.update(entity);

apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/ConfigController.java

@@ -51,7 +51,6 @@ public class ConfigController {
     model.setEnv(env);
     model.setNamespaceName(namespaceName);
 
-
     configService.updateConfigItemByText(model);
   }
 

apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/txtresolver/FileTextResolver.java

@@ -21,19 +21,20 @@ public class FileTextResolver implements ConfigTextResolver {
       return changeSets;
     }
     if (CollectionUtils.isEmpty(baseItems)) {
-      changeSets.addCreateItem(createItem(namespaceId, configText));
+      changeSets.addCreateItem(createItem(namespaceId, 0, configText));
     } else {
       ItemDTO beforeItem = baseItems.get(0);
       if (!configText.equals(beforeItem.getValue())) {//update
-        changeSets.addUpdateItem(createItem(namespaceId, configText));
+        changeSets.addUpdateItem(createItem(namespaceId, beforeItem.getId(), configText));
       }
     }
 
     return changeSets;
   }
 
-  private ItemDTO createItem(long namespaceId, String value) {
+  private ItemDTO createItem(long namespaceId, long itemId, String value) {
     ItemDTO item = new ItemDTO();
+    item.setId(itemId);
     item.setNamespaceId(namespaceId);
     item.setValue(value);
     item.setKey(ConfigConsts.CONFIG_FILE_CONTENT_KEY);

apollo-portal/src/main/resources/static/scripts/controller/NamespaceController.js

@@ -112,7 +112,7 @@ namespace_module.controller("LinkNamespaceController",
                                                      } else {//private的直接link并且跳转到授权页面
                                                          $window.location.href =
                                                              "/namespace/role.html?#/appid=" + $scope.appId
-                                                             + "&namespaceName=" + $scope.appNamespace.name;
+                                                             + "&namespaceName=" + result.name;
                                                      }
                                                  }, 1000);
                                              }, function (result) {

apollo-portal/src/main/resources/static/scripts/directive/namespace-panel-directive.js

@@ -26,7 +26,7 @@ directive_module.directive('apollonspanel',
                                            LOG: 'log'
                                        };
 
-                                       var MIN_ROW_SIZE = 30;
+                                       var MIN_ROW_SIZE = 10;
 
                                        scope.switchView = switchView;