Modified: rave/branches/angular/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbPageRepositoryTest.java URL: http://svn.apache.org/viewvc/rave/branches/angular/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbPageRepositoryTest.java?rev=1514544&r1=1514543&r2=1514544&view=diff ============================================================================== --- rave/branches/angular/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbPageRepositoryTest.java (original) +++ rave/branches/angular/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbPageRepositoryTest.java Fri Aug 16 00:15:07 2013 @@ -76,7 +76,7 @@ public class MongoDbPageRepositoryTest { expect(template.find(isA(Query.class))).andReturn(pages); replay(template); - List<Page> result = repo.getAllPagesForUserType(userId, pageType); + List<Page> result = repo.getAllPagesForUserType(userId, pageType.toString()); assertNotNull(result); } @@ -108,7 +108,7 @@ public class MongoDbPageRepositoryTest { subRegions.add(subRegion); sub.setPageTemplateRegions(subRegions); sub.setName("sub"); - sub.setPageType(PageType.SUB_PAGE); + sub.setPageType(PageType.SUB_PAGE.toString()); sub.setPageLayout(layout); sub.setPageTemplateRegions(subRegions); sub.setRenderSequence(2000L); @@ -128,7 +128,7 @@ public class MongoDbPageRepositoryTest { regions.add(region); pt.setName("carol"); - pt.setPageType(PageType.USER); + pt.setPageType(PageType.USER.toString()); pt.setPageLayout(layout); subPageTemplates.add(sub); pt.setSubPageTemplates(subPageTemplates); @@ -165,7 +165,7 @@ public class MongoDbPageRepositoryTest { expectLastCall(); replay(template); - resultCount = repo.deletePages(userID, PageType.USER); + resultCount = repo.deletePages(userID, PageType.USER.toString().toString()); assertThat(resultCount, is(equalTo(1))); verify(template); } @@ -175,10 +175,10 @@ public class MongoDbPageRepositoryTest { String userId = "1234L"; User user = new UserImpl(userId); Page page = new PageImpl(); - page.setPageType(PageType.PERSON_PROFILE); + page.setPageType(PageType.PERSON_PROFILE.toString()); page.setOwnerId(userId); - expect(template.count(query(where("pageType").is(PageType.PERSON_PROFILE).andOperator(where("ownerId").is(userId))))).andReturn(1L); + expect(template.count(query(where("pageType").is("PERSON_PROFILE").andOperator(where("ownerId").is(userId))))).andReturn(1L); replay(template); boolean result = repo.hasPersonPage(userId); @@ -190,7 +190,7 @@ public class MongoDbPageRepositoryTest { public void hasPersonPage_false(){ String userId = "1234L"; - expect(template.count(query(where("pageType").is(PageType.PERSON_PROFILE).andOperator(where("ownerId").is(userId))))).andReturn(0L); + expect(template.count(query(where("pageType").is("PERSON_PROFILE").andOperator(where("ownerId").is(userId))))).andReturn(0L); replay(template); boolean result = repo.hasPersonPage(userId); @@ -227,7 +227,7 @@ public class MongoDbPageRepositoryTest { expect(template.find(query(where("members").elemMatch(where("userId").is(userId)).andOperator(where("pageType").is("USER"))))).andReturn(pages); replay(template); - result = repo.getPagesForUser(userId, PageType.USER); + result = repo.getPagesForUser(userId, PageType.USER.toString().toString()); assertThat(result.get(0).getUserId(), is(equalTo(user2.getId()))); assertThat(result.size(), is(equalTo(2))); @@ -267,7 +267,7 @@ public class MongoDbPageRepositoryTest { expect(template.find(query(where("members").elemMatch(where("userId").is(userId)).andOperator(where("pageType").is("USER"))))).andReturn(pages); replay(template); - result = repo.getPagesForUser(userId, PageType.USER); + result = repo.getPagesForUser(userId, PageType.USER.toString().toString()); assertThat(result.get(0).getUserId(), is(equalTo("2222L"))); assertThat(result.size(), is(equalTo(2))); @@ -291,7 +291,7 @@ public class MongoDbPageRepositoryTest { expect(template.find(query(where("members").elemMatch(where("userId").is(userId)).andOperator(where("pageType").is("USER"))))).andReturn(pages); replay(template); - result = repo.getPagesForUser(userId, PageType.USER); + result = repo.getPagesForUser(userId, PageType.USER.toString().toString()); assertThat(result.size(), is(equalTo(1))); }
Modified: rave/branches/angular/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbPageTemplateRepositoryTest.java URL: http://svn.apache.org/viewvc/rave/branches/angular/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbPageTemplateRepositoryTest.java?rev=1514544&r1=1514543&r2=1514544&view=diff ============================================================================== --- rave/branches/angular/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbPageTemplateRepositoryTest.java (original) +++ rave/branches/angular/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbPageTemplateRepositoryTest.java Fri Aug 16 00:15:07 2013 @@ -84,7 +84,7 @@ public class MongoDbPageTemplateReposito expectLastCall(); replay(converter, template); - PageTemplate returned = templateRepository.getDefaultPage(pageType); + PageTemplate returned = templateRepository.getDefaultPage(pageType.toString()); assertThat((MongoDbPageTemplate)returned, is(sameInstance(found))); } Modified: rave/branches/angular/rave-portal-resources/src/main/webapp/static/script/core/rave_api.js URL: http://svn.apache.org/viewvc/rave/branches/angular/rave-portal-resources/src/main/webapp/static/script/core/rave_api.js?rev=1514544&r1=1514543&r2=1514544&view=diff ============================================================================== --- rave/branches/angular/rave-portal-resources/src/main/webapp/static/script/core/rave_api.js (original) +++ rave/branches/angular/rave-portal-resources/src/main/webapp/static/script/core/rave_api.js Fri Aug 16 00:15:07 2013 @@ -65,8 +65,8 @@ define(['underscore', 'core/rave_ajax', function saveWidgetPreference(args) { ajax({ type: 'PUT', - url: context + path + "regionWidgets/" + args.regionWidgetId + "/preferences/" + args.userPref.prefName, - data: JSON.stringify({"name": args.userPref.prefName, "value": args.userPref.prefValue}), + url: context + path + "regionWidgets/" + args.regionWidgetId + "/preferences/" + args.prefName, + data: JSON.stringify({"name": args.prefName, "value": args.prefValue}), contentType: 'application/json', dataType: 'json', success: function (result) { Modified: rave/branches/angular/rave-portal-resources/src/main/webapp/static/script/core/rave_opensocial.js URL: http://svn.apache.org/viewvc/rave/branches/angular/rave-portal-resources/src/main/webapp/static/script/core/rave_opensocial.js?rev=1514544&r1=1514543&r2=1514544&view=diff ============================================================================== --- rave/branches/angular/rave-portal-resources/src/main/webapp/static/script/core/rave_opensocial.js (original) +++ rave/branches/angular/rave-portal-resources/src/main/webapp/static/script/core/rave_opensocial.js Fri Aug 16 00:15:07 2013 @@ -82,8 +82,8 @@ define(['underscore', 'core/rave_view_ma "securityToken": data.securityToken, "metadata": opt_gadgetInfo }, - height = gadget.metadata.modulePrefs.height || stateManager.getDefaultHeight(), - width = gadget.metadata.modulePrefs.width || stateManager.getDefaultWidth(); + height = getHeightFromParams(gadget.metadata.modulePrefs), + width = getWidthFromParams(gadget.metadata.modulePrefs); preloadMetadata(gadget); @@ -158,6 +158,34 @@ define(['underscore', 'core/rave_view_ma } } + function getHeightFromParams(opts) { + var height; + if(opts.height) { + height = opts.height; + } + else if(opts.preferredHeight) { + height = opts.preferredHeight; + } + else { + height = stateManager.getDefaultHeight(); + } + return height; + } + + function getWidthFromParams(opts) { + var width; + if(opts.width) { + width = opts.width; + } + else if(opts.preferredWidth) { + width = opts.preferredWidth; + } + else { + width = stateManager.getDefaultWidth(); + } + return width; + } + exports.renderWidget = function (widget, el, opts) { if (widget.error) { widget.renderError(el, widget.error.message); @@ -172,10 +200,10 @@ define(['underscore', 'core/rave_view_ma renderParams[osapi.container.RenderParam.VIEW] = opts.view || stateManager.getDefaultView(); renderParams[osapi.container.RenderParam.ALLOW_DEFAULT_VIEW ] = opts.allowDefaultView; renderParams[osapi.container.RenderParam.DEBUG ] = opts.debug; - renderParams[osapi.container.RenderParam.HEIGHT ] = opts.height || stateManager.getDefaultHeight(); + renderParams[osapi.container.RenderParam.HEIGHT ] = getHeightFromParams(opts); renderParams[osapi.container.RenderParam.NO_CACHE ] = opts.noCache; renderParams[osapi.container.RenderParam.TEST_MODE] = opts.testMode; - renderParams[osapi.container.RenderParam.WIDTH ] = opts.width || stateManager.getDefaultWidth(); + renderParams[osapi.container.RenderParam.WIDTH ] = getWidthFromParams(opts); renderParams[osapi.container.RenderParam.USER_PREFS] = getCompleteUserPrefSet(widget.userPrefs, widget.metadata.userPrefs); container.navigateGadget(site, widget.widgetUrl, opts.view_params, renderParams, opts.callback); } Modified: rave/branches/angular/rave-portal-resources/src/main/webapp/static/script/portal/routes.js URL: http://svn.apache.org/viewvc/rave/branches/angular/rave-portal-resources/src/main/webapp/static/script/portal/routes.js?rev=1514544&r1=1514543&r2=1514544&view=diff ============================================================================== --- rave/branches/angular/rave-portal-resources/src/main/webapp/static/script/portal/routes.js (original) +++ rave/branches/angular/rave-portal-resources/src/main/webapp/static/script/portal/routes.js Fri Aug 16 00:15:07 2013 @@ -23,33 +23,31 @@ define(['angular', 'common/resources/ind router.config(['$routeProvider', '$locationProvider', '$httpProvider', function ($routeProvider, $locationProvider, $httpProvider) { - var getPages = ['PagesForRender', '$q', '$rootScope', function (PagesForRender, $q, $rootScope) { - var deferred = $q.defer(); - - if($rootScope.pages) { - deferred.resolve($rootScope.pages); - } else { - PagesForRender.query({ - context: 'portal', - identifier: '@self' - }, function(data){ - deferred.resolve(data); - }); - } + var resolve = { + pages: ['PagesForRender', '$q', '$rootScope', function (PagesForRender, $q, $rootScope) { + var deferred = $q.defer(); + + if($rootScope.pages) { + deferred.resolve($rootScope.pages); + } else { + PagesForRender.query({ + context: 'portal', + identifier: '@self' + }, function(data){ + deferred.resolve(data); + }); + } - return deferred.promise; - }] + return deferred.promise; + }] + } $routeProvider .when('/', { - resolve: { - pages: getPages - } + resolve: resolve }) .when('/:tabId', { - resolve: { - pages: getPages - } + resolve: resolve }) .otherwise({ templateUrl: '/portal/static/html/portal/404.html'}); Modified: rave/branches/angular/rave-portal-resources/src/main/webapp/static/script/portal_old/rave_ui.js URL: http://svn.apache.org/viewvc/rave/branches/angular/rave-portal-resources/src/main/webapp/static/script/portal_old/rave_ui.js?rev=1514544&r1=1514543&r2=1514544&view=diff ============================================================================== --- rave/branches/angular/rave-portal-resources/src/main/webapp/static/script/portal_old/rave_ui.js (original) +++ rave/branches/angular/rave-portal-resources/src/main/webapp/static/script/portal_old/rave_ui.js Fri Aug 16 00:15:07 2013 @@ -18,7 +18,7 @@ */ define(["jquery", "underscore", "rave", - "portal_old/rave_portal", "portal_old/rave_backbone", "portal_old/rave_models", "portal_old/rave_templates", + "portal/rave_portal", "portal/rave_backbone", "portal/rave_models", "portal/rave_templates", "jqueryUi"], function ($, _, rave, ravePortal, raveBackbone, raveModels, raveTemplates) { var exports = {}; @@ -407,7 +407,9 @@ define(["jquery", "underscore", "rave", var hasRequiredUserPrefs = false; if (widgetDefinition.metadata.views.preferences) { - widget.render('dialog', {view: widgetDefinition.metadata.views.preferences}); + var opts = {}; + _.extend(opts, widgetDefinition.metadata.views.preferences, {view: 'preferences'}); + widget.render('dialog', opts); } else { //format the data for display _.each(userPrefs, function (pref) { @@ -557,6 +559,7 @@ define(["jquery", "underscore", "rave", this.$menuItemRate = $("#widget-" + regionWidgetId + "-menu-rate-item"); this.$menuItemEditPrefs = $("#widget-" + regionWidgetId + "-menu-editprefs-item"); this.$widgetSite = $("#widget-" + regionWidgetId + "-body"); + this.$title = $("#widget-" + regionWidgetId + "-title"); } HomeView.prototype.render = function (widget) { @@ -726,13 +729,17 @@ define(["jquery", "underscore", "rave", HomeView.prototype.collapse = function () { this.$chrome.hide(); } + HomeView.prototype.setTitle = function(title) { + this.$title.html(title); + } rave.registerView('home', HomeView); } function registerCanvasView() { - var CanvasView = function () { - this.widget; + var CanvasView = function (widget) { + this.widget = widget; + this.$title = $("#widget-" + widget.regionWidgetId + "-title"); } CanvasView.prototype.render = function (widget) { this.widget = widget; @@ -792,6 +799,9 @@ define(["jquery", "underscore", "rave", // otherwise execute the minimize function return false; } + CanvasView.prototype.setTitle = function(title) { + this.$title.html(title); + } rave.registerView('canvas', CanvasView); } Modified: rave/branches/angular/rave-portal-resources/src/test/javascript/core/rave_api.spec URL: http://svn.apache.org/viewvc/rave/branches/angular/rave-portal-resources/src/test/javascript/core/rave_api.spec?rev=1514544&r1=1514543&r2=1514544&view=diff ============================================================================== --- rave/branches/angular/rave-portal-resources/src/test/javascript/core/rave_api.spec (original) +++ rave/branches/angular/rave-portal-resources/src/test/javascript/core/rave_api.spec Fri Aug 16 00:15:07 2013 @@ -77,7 +77,7 @@ describe('rave_api', function(){ describe('saveWidgetPreference', function () { it('makes the correct api call', function () { - api.rest.saveWidgetPreference({regionWidgetId: 1, userPref: {"prefName": "color", prefValue:"blue"}, + api.rest.saveWidgetPreference({regionWidgetId: 1, "prefName": "color", prefValue:"blue", successCallback: testScope.callback}); expectAjax( Modified: rave/branches/angular/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetWrapperRenderer.java URL: http://svn.apache.org/viewvc/rave/branches/angular/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetWrapperRenderer.java?rev=1514544&r1=1514543&r2=1514544&view=diff ============================================================================== --- rave/branches/angular/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetWrapperRenderer.java (original) +++ rave/branches/angular/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetWrapperRenderer.java Fri Aug 16 00:15:07 2013 @@ -132,7 +132,7 @@ public class OpenSocialWidgetWrapperRend String pageName = ""; boolean isDefault = false; Page page = item.getRegion().getPage(); - if (PageType.SUB_PAGE.equals(page.getPageType())) { + if (page.getParentPage() != null) { pageId = "'" + page.getId() + "'"; pageName = page.getName(); // check to see if this regionWidget is on the first sub page, which will be the default Modified: rave/branches/angular/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/test/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetRendererTest.java URL: http://svn.apache.org/viewvc/rave/branches/angular/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/test/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetRendererTest.java?rev=1514544&r1=1514543&r2=1514544&view=diff ============================================================================== --- rave/branches/angular/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/test/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetRendererTest.java (original) +++ rave/branches/angular/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/test/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetRendererTest.java Fri Aug 16 00:15:07 2013 @@ -89,7 +89,7 @@ public class OpenSocialWidgetRendererTes subPage.setId(VALID_SUBPAGE_ID); subPage.setName(VALID_SUBPAGE_NAME); subPage.setParentPage(page); - subPage.setPageType(PageType.SUB_PAGE); + subPage.setPageType(PageType.SUB_PAGE.toString()); page.getSubPages().add(subPage); WidgetImpl w = new WidgetImpl(); @@ -148,7 +148,7 @@ public class OpenSocialWidgetRendererTes final String REGION_ID = "8675309"; Page page = new PageImpl(); - page.setPageType(PageType.USER); + page.setPageType(PageType.USER.toString()); WidgetImpl w = new WidgetImpl(); w.setType(Constants.WIDGET_TYPE); Modified: rave/branches/angular/rave-providers/rave-w3c-provider/src/test/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetRendererTest.java URL: http://svn.apache.org/viewvc/rave/branches/angular/rave-providers/rave-w3c-provider/src/test/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetRendererTest.java?rev=1514544&r1=1514543&r2=1514544&view=diff ============================================================================== --- rave/branches/angular/rave-providers/rave-w3c-provider/src/test/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetRendererTest.java (original) +++ rave/branches/angular/rave-providers/rave-w3c-provider/src/test/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetRendererTest.java Fri Aug 16 00:15:07 2013 @@ -86,7 +86,7 @@ public class W3cWidgetRendererTest { subPage.setId(VALID_SUBPAGE_ID); subPage.setName(VALID_SUBPAGE_NAME); subPage.setParentPage(page); - subPage.setPageType(PageType.SUB_PAGE); + subPage.setPageType(PageType.SUB_PAGE.toString()); page.getSubPages().add(subPage); W3CWidget w = new W3CWidget("1");
