Merge pull request #1094 from Savvas-cl/dev

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

Author: birdofpreyru

app/directives/challenge-tile/challenge-tile.jade

@@ -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
 

app/services/challenge.service.js

@@ -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
@@ -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) {