Author: [email protected]
Date: Tue Jan 24 14:42:11 2012
New Revision: 1986
Log:
[AMDATUOPENSOCIAL-189] Fixed; the remove button shouldn't have been there for
gadgets stored in in the internal repository. Also fixed layout of category
count.
Modified:
trunk/amdatu-opensocial/opensocial-dashboard/src/main/resources/static/js/dashboard.js
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/rest/BaseRESTServiceImpl.java
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/service/GadgetManagementServiceImpl.java
Modified:
trunk/amdatu-opensocial/opensocial-dashboard/src/main/resources/static/js/dashboard.js
==============================================================================
---
trunk/amdatu-opensocial/opensocial-dashboard/src/main/resources/static/js/dashboard.js
(original)
+++
trunk/amdatu-opensocial/opensocial-dashboard/src/main/resources/static/js/dashboard.js
Tue Jan 24 14:42:11 2012
@@ -142,11 +142,11 @@
shindig.Gadget.call(this, opt_params);
this.serverBase_ = contextPath + '/gadgets/'; // default gadget server
this.queryIfrGadgetType_();
- };
+ };
widget.WidgetIfrGadget.inherits(shindig.BaseIfrGadget);
shindig.IfrContainer.prototype.gadgetClass = widget.WidgetIfrGadget;
-
+
var metadata = widget.metadata;
if (typeof metadata != 'undefined' && typeof metadata.gadgetUrl !=
'undefined') {
var gadget = shindig.container.createGadget(
@@ -236,17 +236,17 @@
var widget =
dashboard.widgetsToAdd[$(this).attr("id").replace('removegadget','')];
var uri = widget.metadata.gadgetUrl;
var cat = $('.selectcategory.selected');
- var button = cat[0];
+ var li = cat[0];
if (removeGadgetFromRepository(uri)) {
// Current gadget category count must be decreased by 1
- var count = button.innerHTML;
- count = count.replace("<button>", "").replace("</button>", "");
- var catName = count.substring(0, count.lastIndexOf("("));
- count = count.substring(count.lastIndexOf("(") + 1);
- count = count.substring(0, count.indexOf(")"));
- var newCount = parseInt(count) - 1;
- button.innerHTML = "<button>" + catName + "(" + newCount +
")</button>";
+ var button = $(li).find('button');
+ var count = button.attr("value");
+ var title = button.attr("title");
+ var span = $(button).find('span');
+ var newcount = parseInt(count) - 1;
+ span[0].innerHTML = title + " (" + newcount + ")";
+ button.attr('value', newcount);
}
button.click();
Modified:
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/rest/BaseRESTServiceImpl.java
==============================================================================
---
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/rest/BaseRESTServiceImpl.java
(original)
+++
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/rest/BaseRESTServiceImpl.java
Tue Jan 24 14:42:11 2012
@@ -174,8 +174,7 @@
// Set mgmt authorization
// If the widget is associated with an internal gadget, it cannot be
removed from the store
- // Internal gadgets are registered with a relative URL, so first make
the URL relative
- GadgetDefinition gadgetDef =
m_gadgetManagement.getGadget(toRelativeUrl(gadgetUrl));
+ GadgetDefinition gadgetDef = m_gadgetManagement.getGadget(gadgetUrl);
if (gadgetDef != null && gadgetDef.isInternal()) {
widget.setRemoveAccessGranted(false);
}
Modified:
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/service/GadgetManagementServiceImpl.java
==============================================================================
---
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/service/GadgetManagementServiceImpl.java
(original)
+++
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/service/GadgetManagementServiceImpl.java
Tue Jan 24 14:42:11 2012
@@ -113,7 +113,12 @@
return m_internalGadgetStore.getGadget(gadgetUrl);
}
else {
- // Only external gadgets use absolute URLs
+ // Absolute urls can be stored in the internal and external store,
but the
+ // internal store is leading
+ GadgetDefinition def = m_internalGadgetStore.getGadget(gadgetUrl);
+ if (def != null) {
+ return def;
+ }
return m_externalGadgetStore.getGadget(gadgetUrl);
}
}
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
