Merge branch 'hotfix/130' into develop

Forward port #130
zfcampus · Dec 19, 2016 · 39bb74c · 39bb74c
2 parents 919142e + d4c5514
commit 39bb74c
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 40 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -36,7 +36,9 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#130](https://github.com/zfcampus/zf-apigility-admin-ui/pull/130) updates the
+  UI to ensure the `object_manager` key is passed when creating or updating a
+  Doctrine-based service.
 
 ## 1.3.8 - 2016-08-17
 

diff --git a/dist/apigility-ui/1bc54cd5.vendor.js b/dist/apigility-ui/1bc54cd5.vendor.js
diff --git a/dist/apigility-ui/76d13e21.vendor.js b/dist/apigility-ui/76d13e21.vendor.js
diff --git a/dist/apigility-ui/537dc760.apigility.js → dist/apigility-ui/cc549c05.apigility.js b/dist/apigility-ui/537dc760.apigility.js → dist/apigility-ui/cc549c05.apigility.js
diff --git a/dist/apigility-ui/css/1a52735a.apigility.min.css b/dist/apigility-ui/css/1a52735a.apigility.min.css
diff --git a/dist/apigility-ui/css/e9f1cf46.apigility.min.css b/dist/apigility-ui/css/e9f1cf46.apigility.min.css
diff --git a/dist/index.html b/dist/index.html
@@ -14,7 +14,7 @@
 
     <link rel="icon" href="apigility-ui/img/favicon.png">
 
-    <link rel="stylesheet" href="apigility-ui/css/1a52735a.apigility.min.css"/>
+    <link rel="stylesheet" href="apigility-ui/css/e9f1cf46.apigility.min.css"/>
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
@@ -42,9 +42,9 @@
       </footer>
     </div>
 
-    <script src="apigility-ui/76d13e21.vendor.js" charset="utf-8"></script>
+    <script src="apigility-ui/1bc54cd5.vendor.js" charset="utf-8"></script>
 
-    <script src="apigility-ui/537dc760.apigility.js" charset="utf-8"></script>
+    <script src="apigility-ui/cc549c05.apigility.js" charset="utf-8"></script>
 
     <script>
       $(document).ready(function () {

diff --git a/src/apigility-ui/service/api.service.js b/src/apigility-ui/service/api.service.js
@@ -138,7 +138,7 @@
         'adapter_name'
       ];
       if (isDoctrine) {
-        allowed.push('strategies', 'by_value');
+        allowed.push('object_manager', 'strategies', 'by_value');
       }
       var result = filterData(data, allowed);
       var path = isDoctrine ? '/doctrine/' : '/rest/';