Merge pull request #227 from jenananthan/master

Fix api conflicts
wso2 · Mar 9, 2016 · 9223944 · 9223944
2 parents 62a7789 + ee542c3
commit 9223944
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...carbon.appmgt.publisher.feature/src/main/resources/publisher/apis/v1/asset_api_router.jag b/...carbon.appmgt.publisher.feature/src/main/resources/publisher/apis/v1/asset_api_router.jag
@@ -913,7 +913,7 @@ require('/modules/publisher.js').exec(function(ctx) {
 
 
     //get uuid of given asset for-> provider,name,lifecycle state
-    routeManager.register('GET', 'publisher', '/publisher/api/asset/get/uuid/list/{type}/{provider}/{name}/{lifecyclestate}',
+    routeManager.register('GET', 'publisher', '/publisher/api/asset/get/uuid/list/state/{type}/{provider}/{name}/{lifecyclestate}',
                           function (context) {
                               var assetProvider = context.params.provider;
                               var assetName = context.params.name;

diff --git a/...arbon.appmgt.publisher.feature/src/main/resources/publisher/themes/appm/js/list-assets.js b/...arbon.appmgt.publisher.feature/src/main/resources/publisher/themes/appm/js/list-assets.js
@@ -238,7 +238,7 @@ function isPublishedToExternalStore(action, provider, name, version) {
 function isPublishedVersionsAvailable(provider, name) {
     var result;
     $.ajax({
-               url: caramel.context + '/api/asset/get/uuid/list/' + 'webapp' + '/' + provider + '/' + name + '/'
+               url: caramel.context + '/api/asset/get/uuid/list/state/' + 'webapp' + '/' + provider + '/' + name + '/'
                     + 'Published',
                type: 'GET',
                async: false,