From 3c1ff045b0c005950a0d1980e5b534dc822a476e Mon Sep 17 00:00:00 2001 From: vikasrohit Date: Tue, 9 Feb 2016 11:40:28 +0530 Subject: [PATCH 1/2] SUP-2839, Profile: # of wins in summary does not match winning challenges shown on Profile -- Implemented code review suggestions. --- app/directives/challenge-tile/challenge-tile.jade | 4 ++-- .../challenge-user-place/design-challenge-user-place.jade | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/directives/challenge-tile/challenge-tile.jade b/app/directives/challenge-tile/challenge-tile.jade index fd2d131f6..7b7e26bf1 100644 --- a/app/directives/challenge-tile/challenge-tile.jade +++ b/app/directives/challenge-tile/challenge-tile.jade @@ -57,13 +57,13 @@ .challenge-details(ng-switch-when="DEVELOP") dev-challenge-user-place(challenge="challenge", view="view", ng-hide="challenge.isPrivate") .invite-only-banner(ng-show="challenge.isPrivate") - img(src=require("../../../assets/images/ico-invite-only-prj.svg")) + img(ng-src=require("../../../assets/images/ico-invite-only-prj.svg")) span INVITE-ONLY CHALLENGE .challenge-details(ng-switch-when="DESIGN") design-challenge-user-place(challenge="challenge", view="view", ng-hide="challenge.isPrivate") .invite-only-banner(ng-show="challenge.isPrivate") - img(src=require("../../../assets/images/ico-invite-only-prj.svg")) + img(ng-src=require("../../../assets/images/ico-invite-only-prj.svg")) span INVITE-ONLY CHALLENGE // Only show if not data science track diff --git a/app/directives/challenge-user-place/design-challenge-user-place.jade b/app/directives/challenge-user-place/design-challenge-user-place.jade index 2e5448852..43d1425f6 100644 --- a/app/directives/challenge-user-place/design-challenge-user-place.jade +++ b/app/directives/challenge-user-place/design-challenge-user-place.jade @@ -6,9 +6,9 @@ .thumbnail(ng-click="!challenge.isPrivate && imageURL && openLightbox()", ng-class="{hidden: challenge.userStatus !== 'PASSED_REVIEW'}") img(ng-show="challenge.submissionViewable && imageURL", ng-src="{{imageURL}}") - img(ng-show="challenge.submissionViewable && !imageURL", ng-src="../../../assets/images/card-bg-no-image.svg") + img(ng-show="challenge.submissionViewable && !imageURL", ng-src=require("../../../assets/images/card-bg-no-image.svg")) .private-challenge-banner(ng-show="!challenge.submissionViewable") - img(src=require("../../../assets/images/ico-private-prj.svg")) + img(ng-src=require("../../../assets/images/ico-private-prj.svg")) span PRIVATE CHALLENGE .thumbnail-gallery(ng-show="numImages", ng-click="!challenge.isPrivate && imageURL && openLightbox()") @@ -31,9 +31,9 @@ .thumbnail(ng-click="!challenge.isPrivate && imageURL && openLightbox()", ng-class="{hidden: challenge.userStatus !== 'PASSED_REVIEW'}") img(ng-show="challenge.submissionViewable && imageURL", ng-src="{{imageURL}}") - img(ng-show="challenge.submissionViewable && !imageURL", ng-src="../../../assets/images/card-bg-no-image.svg") + img(ng-show="challenge.submissionViewable && !imageURL", ng-src=require("../../../assets/images/card-bg-no-image.svg")) .private-challenge-banner(ng-show="!challenge.submissionViewable") - img(src=require("../../../assets/images/ico-private-prj.svg")) + img(ng-src=require("../../../assets/images/ico-private-prj.svg")) .thumbnail-gallery(ng-show="numImages", ng-click="!challenge.isPrivate && imageURL && openLightbox()") .gallery-icon From 4ada18ff7e365fd060c2863f323443efc59f328d Mon Sep 17 00:00:00 2001 From: vikasrohit Date: Tue, 9 Feb 2016 11:41:43 +0530 Subject: [PATCH 2/2] SUP-3012, [Profile] Implement "private challenge" card -- Removed workaround code for submissionViewable field after getting it from the API response. --- app/services/challenge.service.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/services/challenge.service.js b/app/services/challenge.service.js index 88a0652d3..98b01f882 100644 --- a/app/services/challenge.service.js +++ b/app/services/challenge.service.js @@ -231,8 +231,6 @@ import moment from 'moment' if (!challenge.userHasSubmitterRole) { challenge.userStatus = 'COMPLETED' } - // FIXME, replace with field from response - challenge.submissionViewable = !challenge.isPrivate } }) }