suzanne.soy/travis-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Display remove log only when user hasPermissions to use it

Browse Source
This commit is contained in:
Piotr Sarnacki 2015-01-09 14:59:19 +01:00
parent eb78d62adb
commit aca82a0379
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
assets/scripts/app/templates/repos/show/actions.hbs
View File

@ -39,11 +39,15 @@
</li>
{{/if}}
{{/if}}
{{#if view.displayRemoveLog}}
<li class="icon remove-log" title="Remove Log">
<a href="#" name="remove-log-popup" class="open-popup" {{action "removeLogPopup" target=view}}
{{bind-attr class="view.canRemoveLog::disabled"}}></a>
</li>
{{! the next if is a hack for refreshing displayRemoveLog when we change
views, it sometimes doesn't work properly }}
{{#if view.jobIdForLog}}
{{#if view.displayRemoveLog}}
<li class="icon remove-log" title="Remove Log">
<a href="#" name="remove-log-popup" class="open-popup" {{action "removeLogPopup" target=view}}
{{bind-attr class="view.canRemoveLog::disabled"}}></a>
</li>
{{/if}}
{{/if}}
{{#if view.displayCodeClimate}}
<li class="icon code-climate" title="Test Coverage with Code Climate">

11
assets/scripts/app/views/repo/show.coffee
View File

@ -288,13 +288,14 @@ Travis.reopen
).property('jobIdForLog', 'job.log.token', 'build.jobs.firstObject.log.token')
canRemoveLog: (->
@get('displayRemoveLog') && @get('hasPermission')
).property('displayRemoveLog', 'hasPermission')
@get('displayRemoveLog')
).property('displayRemoveLog')
displayRemoveLog: (->
if job = Travis.Job.find(@get('jobIdForLog'))
(@get('isJobTab') || (@get('isBuildTab') && @get('build.jobs.length') == 1)) && job.get('canRemoveLog')
).property('isJobTab', 'isBuildTab', 'build.jobs.length', '_job.canRemoveLog', 'jobIdForLog')
if job = @get('_job')
(@get('isJobTab') || (@get('isBuildTab') && @get('build.jobs.length') == 1)) &&
job.get('canRemoveLog') && @get('hasPermission')
).property('isJobTab', 'isBuildTab', 'build.jobs.length', '_job.canRemoveLog', 'jobIdForLog', 'canRemoveLog', 'hasPermission')
canCancelBuild: (->
@get('displayCancelBuild') && @get('hasPermission')