Skip to content
This repository was archived by the owner on Mar 4, 2025. It is now read-only.

Fix for issue #1083 Complete Appeals shown only when Submitter role p… #1094

Merged
merged 1 commit into from
Mar 20, 2017
Merged

Fix for issue #1083 Complete Appeals shown only when Submitter role p… #1094

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/directives/challenge-tile/challenge-tile.jade
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
.stalled-challenge(ng-hide="challenge.userCurrentPhaseEndTime") This challenge is currently paused.

.phase-action(ng-show="challenge.userAction", ng-switch="challenge.userAction")
a.tc-btn.tc-btn-s.tc-btn-wide.tc-btn-ghost.submit(ng-switch-when="Submit", ng-href="{{challenge|challengeLinks:'submit'}}") Submit
a.tc-btn.tc-btn-s.tc-btn-wide.tc-btn-ghost.submit(ng-switch-when="Submit", ng-href="{{challenge|challengeLinks:'submit'}}") Submit
a.tc-btn.tc-btn-s.tc-btn-wide.btn-danger.submit(ng-switch-when="Submit", ng-href="{{challenge|challengeLinks:'unRegister'}}") Unregister
a.tc-btn.tc-btn-s.tc-btn-wide.tc-btn-ghost.submit(ng-switch-when="Appeal", ng-href="{{challenge|challengeLinks:'viewScorecards'}}") View Scorecards
a.tc-btn.tc-btn-s.tc-btn-wide.btn-danger.submit(ng-switch-when="Appeal", ng-href="{{challenge|challengeLinks:'completeAppeals'}}") Complete Appeals
a.tc-btn.tc-btn-s.tc-btn-wide.btn-danger.submit(ng-if="challenge.isSubmitter")(ng-switch-when="Appeal", ng-href="{{challenge|challengeLinks:'completeAppeals'}}") Complete Appeals

.submitted(ng-switch-when="Submitted") Submitted

Expand Down
4 changes: 4 additions & 0 deletions app/services/challenge.service.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ import moment from 'moment'
challenge.userCurrentPhase = 'Stalled'
challenge.userCurrentPhaseEndTime = null
challenge.userAction = null
challenge.isSubmitter = false

if (phases && phases.length) {
hasCurrentPhase = true
Expand Down Expand Up @@ -96,6 +97,9 @@ import moment from 'moment'
if (roles && roles.length > 0) {
var submitterRole = _.findIndex(roles, function(role) {
var lRole = role.toLowerCase()
if (lRole === 'submitter') {
challenge.isSubmitter = true
}
return lRole === 'submitter'
})
if (submitterRole === -1) {
Expand Down