diff --git a/ui/scripts/sharedFunctions.js b/ui/scripts/sharedFunctions.js
index 86dc68eaf4b..dd9a7d697eb 100644
--- a/ui/scripts/sharedFunctions.js
+++ b/ui/scripts/sharedFunctions.js
@@ -821,6 +821,10 @@ cloudStack.api = {
data.projectid=args.context.projects[0].id;
}
+ if(args.jsonObj != null && args.jsonObj.projectid != null && data.projectid == null) {
+ data.projectid = args.jsonObj.projectid;
+ }
+
$.ajax({
url: createURL('listTags'),
data: data,
diff --git a/ui/scripts/ui/widgets/detailView.js b/ui/scripts/ui/widgets/detailView.js
index ab1fe9bb20a..356d9f26664 100644
--- a/ui/scripts/ui/widgets/detailView.js
+++ b/ui/scripts/ui/widgets/detailView.js
@@ -1178,7 +1178,8 @@
!$detailView.data('view-args').compact) {
$('
').tagger(
$.extend(true, {}, tabs.tags, {
- context: $detailView.data('view-args').context
+ context: $detailView.data('view-args').context,
+ jsonObj: $detailView.data('view-args').jsonObj
})
).appendTo($detailView.find('.main-groups'));
}
diff --git a/ui/scripts/ui/widgets/tagger.js b/ui/scripts/ui/widgets/tagger.js
index 0f297eb8f7c..9af6fb70693 100644
--- a/ui/scripts/ui/widgets/tagger.js
+++ b/ui/scripts/ui/widgets/tagger.js
@@ -115,6 +115,7 @@
$.widget('cloudStack.tagger', {
_init: function(args) {
var context = this.options.context;
+ var jsonObj = this.options.jsonObj;
var dataProvider = this.options.dataProvider;
var actions = this.options.actions;
var $container = this.element.addClass('tagger');
@@ -209,6 +210,7 @@
$loading.appendTo($container);
dataProvider({
context: context,
+ jsonObj: jsonObj,
response: {
success: function(args) {
var data = args.data;