fixed a bug in the elastic storage where policies were not being prop…

…erly deserialized
apiman · Nov 2, 2015 · 592c932 · 592c932
1 parent d8e99cf
commit 592c932
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/manager/api/es/src/main/java/io/apiman/manager/api/es/EsStorage.java b/manager/api/es/src/main/java/io/apiman/manager/api/es/EsStorage.java
@@ -2222,6 +2222,13 @@ public Iterator<PolicyBean> getAllPolicies(String organizationId, String entityI
                 return new ArrayList<PolicyBean>().iterator();
             }
             List<PolicyBean> policyBeans = policies.getPolicies();
+            // TODO resolve the policy def, since we know we'll only have the definition ID here
+            for (PolicyBean policyBean : policyBeans) {
+                PolicyDefinitionBean def = getPolicyDefinition(policyBean.getDefinition().getId());
+                if (def != null) {
+                    policyBean.setDefinition(def);
+                }
+            }
             return policyBeans.iterator();
         } catch (Exception e) {
             throw new StorageException(e);

diff --git a/manager/ui/hawtio/plugins/api-manager/css/apiman.css b/manager/ui/hawtio/plugins/api-manager/css/apiman.css
@@ -1038,7 +1038,7 @@ ol.breadcrumb {
   margin-left: 6px;
 }
 .apiman-plan-selector hr {
-  margin-top: 0px;
+  margin-top: 10px;
   margin-bottom: 10px;
 }
 #page-content .apiman-plan-selector div.bootstrap-select {

diff --git a/manager/ui/hawtio/plugins/api-manager/html/org/apiman-user-card-back.html b/manager/ui/hawtio/plugins/api-manager/html/org/apiman-user-card-back.html
@@ -11,7 +11,7 @@
                   ng-select="member.roles">
           </select>
         </div>
-        <div class="actions">
+        <div class="actions" style="margin-top: 5px">
           <button class="btn btn-primary btn-xs btn-apply" apiman-i18n-key="apply" placeholder="Applying..." data-icon="fa-cog" ng-click="updateRoles(updatedRoles) && flipCard(front)">Apply</button>
 
           <button class="btn btn-default btn-xs btn-cancel" ng-click="flipCard(front)" apiman-i18n-key="cancel">Cancel</button>

diff --git a/manager/ui/hawtio/plugins/api-manager/html/service/service-def.html b/manager/ui/hawtio/plugins/api-manager/html/service/service-def.html
@@ -40,7 +40,7 @@
               </p>
             </div>
             <div>
-              <span class="clearfix"
+              <span class="clearfix" style="margin-top:10px; margin-bottom: 10px"
                     apiman-i18n-key="svc-definition-label">Service Definition:</span>
               <select apiman-i18n-key="service-def.choose-type"
                       title="Choose a type..."
@@ -50,7 +50,7 @@
                       ng-options="type.label for type in typeOptions track by type.value"
                       ng-disabled="isEntityDisabled()">
               </select>
-              <textarea apiman-i18n-key="enter-service-definition"
+              <textarea style="margin-top:10px" apiman-i18n-key="enter-service-definition"
                         id="service-definition"
                         placeholder="Copy/paste or drag and drop your Service Definition in here!"
                         style="width: 100%;"