diff --git a/spa/api/v1/ActivityResource.py b/spa/api/v1/ActivityResource.py index 51ebfb6..2557764 100644 --- a/spa/api/v1/ActivityResource.py +++ b/spa/api/v1/ActivityResource.py @@ -24,7 +24,7 @@ class ActivityResource(BackboneCompatibleResource): user_image = bundle.obj.user.get_profile().get_small_profile_image() user_profile = bundle.obj.user.get_profile().get_profile_url() else: - user_name = "Anonymous user" + user_name = "Anonymous" user_image = UserProfile.get_default_avatar_image() user_profile = "" @@ -45,13 +45,3 @@ class ActivityResource(BackboneCompatibleResource): except Exception, ee: self.logger.debug("Exception: Error dehydrating activity, %s" % ee.message) return None - - """" - def alter_list_data_to_serialize(self, request, data): - return [i for i in data['objects'] if i is not None and i.obj.user is not None and i.obj.get_object_name is not None and i.obj.get_object_url is not None] - """ - - """ - def dehydrate_date(self, bundle): - return self.humanize_date(bundle.obj.date) - """ \ No newline at end of file diff --git a/static/js/app/lib/controller.coffee b/static/js/app/lib/controller.coffee index 0f0cef5..5dbc313 100644 --- a/static/js/app/lib/controller.coffee +++ b/static/js/app/lib/controller.coffee @@ -1,7 +1,7 @@ define ['app', 'marionette', 'models/mix/mixItem', 'views/mix/mixListView', 'views/mix/mixDetailView', 'views/mix/mixEditView', - 'models/user/userItem', 'views/user/userEditView'], -(App, Marionette, MixItem, MixListView, MixDetailView, MixEditView, UserItem, UserEditView)-> + 'models/user/userItem', 'views/user/userListView', 'views/user/userEditView'], +(App, Marionette, MixItem, MixListView, MixDetailView, MixEditView, UserItem, UserListView, UserEditView)-> class DssController extends Marionette.Controller home: -> console.log "Controller: home" @@ -49,7 +49,14 @@ define ['app', 'marionette', ) true - user: (slug) -> + showUserList: (type) -> + console.log("Controller: showUserList") + app = require('app') + app.contentRegion.show(new UserListView()) + + + showUserDetail: (slug) -> + console.log("Controller: showUserDetail") @showMixList('latest', {user: slug}) editUser: () -> diff --git a/static/js/app/lib/controller.js b/static/js/app/lib/controller.js index f7f5468..ff9e990 100644 --- a/static/js/app/lib/controller.js +++ b/static/js/app/lib/controller.js @@ -3,7 +3,7 @@ var __hasProp = {}.hasOwnProperty, __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }; - define(['app', 'marionette', 'models/mix/mixItem', 'views/mix/mixListView', 'views/mix/mixDetailView', 'views/mix/mixEditView', 'models/user/userItem', 'views/user/userEditView'], function(App, Marionette, MixItem, MixListView, MixDetailView, MixEditView, UserItem, UserEditView) { + define(['app', 'marionette', 'models/mix/mixItem', 'views/mix/mixListView', 'views/mix/mixDetailView', 'views/mix/mixEditView', 'models/user/userItem', 'views/user/userListView', 'views/user/userEditView'], function(App, Marionette, MixItem, MixListView, MixDetailView, MixEditView, UserItem, UserListView, UserEditView) { var DssController; DssController = (function(_super) { @@ -81,7 +81,15 @@ return true; }; - DssController.prototype.user = function(slug) { + DssController.prototype.showUserList = function(type) { + var app; + console.log("Controller: showUserList"); + app = require('app'); + return app.contentRegion.show(new UserListView()); + }; + + DssController.prototype.showUserDetail = function(slug) { + console.log("Controller: showUserDetail"); return this.showMixList('latest', { user: slug }); diff --git a/static/js/app/lib/router.coffee b/static/js/app/lib/router.coffee index 46663d5..ebd6ef8 100644 --- a/static/js/app/lib/router.coffee +++ b/static/js/app/lib/router.coffee @@ -12,7 +12,8 @@ define ['marionette', 'app.lib/controller'], "mix/:slug": "showMix" "mix/edit/:slug": "editMix", - "user/:slug": "user" + "users": "showUserList" + "user/:slug": "showUserDetail" "me": "editUser" diff --git a/static/js/app/lib/router.js b/static/js/app/lib/router.js index 5f5b4c2..5ca2cc8 100644 --- a/static/js/app/lib/router.js +++ b/static/js/app/lib/router.js @@ -23,7 +23,8 @@ "mixes/:type": "showMixList", "mix/:slug": "showMix", "mix/edit/:slug": "editMix", - "user/:slug": "user", + "users": "showUserList", + "user/:slug": "showUserDetail", "me": "editUser" }; diff --git a/static/js/app/views/mix/mixListView.coffee b/static/js/app/views/mix/mixListView.coffee index 938ef45..ca8b5a7 100644 --- a/static/js/app/views/mix/mixListView.coffee +++ b/static/js/app/views/mix/mixListView.coffee @@ -8,7 +8,7 @@ define ['marionette', 'models/mix/mixCollection', 'views/mix/mixItemView', 'text itemViewContainer: "#mix-list-container-ul" initialize: -> - console.log "MixListView: Before render" + console.log "MixListView: initialize" @collection = new MixCollection() @collection.fetch( data: @options diff --git a/static/js/app/views/mix/mixListView.js b/static/js/app/views/mix/mixListView.js index 2b2aa17..789048f 100644 --- a/static/js/app/views/mix/mixListView.js +++ b/static/js/app/views/mix/mixListView.js @@ -23,7 +23,7 @@ MixListView.prototype.initialize = function() { var _this = this; - console.log("MixListView: Before render"); + console.log("MixListView: initialize"); this.collection = new MixCollection(); this.collection.fetch({ data: this.options, diff --git a/static/js/app/views/user/userItemView.coffee b/static/js/app/views/user/userItemView.coffee index 39295e4..fa8f0d3 100644 --- a/static/js/app/views/user/userItemView.coffee +++ b/static/js/app/views/user/userItemView.coffee @@ -1,5 +1,5 @@ -define ['app', 'marionette'], -(App, Marionette)-> +define ['app', 'marionette', 'text!/tpl/UserListItemView'], +(App, Marionette, Template)-> class UserItemView extends Marionette.ItemView - itemView: UserItemView - \ No newline at end of file + template: _.template(Template) + tagName: "tr" diff --git a/static/js/app/views/user/userItemView.js b/static/js/app/views/user/userItemView.js index 1834370..90cc31d 100644 --- a/static/js/app/views/user/userItemView.js +++ b/static/js/app/views/user/userItemView.js @@ -3,7 +3,7 @@ var __hasProp = {}.hasOwnProperty, __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }; - define(['app', 'marionette'], function(App, Marionette) { + define(['app', 'marionette', 'text!/tpl/UserListItemView'], function(App, Marionette, Template) { var UserItemView; return UserItemView = (function(_super) { @@ -13,7 +13,9 @@ return UserItemView.__super__.constructor.apply(this, arguments); } - UserItemView.prototype.itemView = UserItemView; + UserItemView.prototype.template = _.template(Template); + + UserItemView.prototype.tagName = "tr"; return UserItemView; diff --git a/static/js/app/views/user/userListView.coffee b/static/js/app/views/user/userListView.coffee index fab7c55..ea24817 100644 --- a/static/js/app/views/user/userListView.coffee +++ b/static/js/app/views/user/userListView.coffee @@ -1,10 +1,21 @@ -define ['marionette', 'views/user/userItemView'], -(Marionette, UserItemView) -> +define ['marionette', 'models/user/userCollection', 'views/user/userItemView', 'text!/tpl/UserListView'], +(Marionette, UserCollection, UserItemView, Template) -> class UserListView extends Marionette.CompositeView - template: "