Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix workplan in permissionless #4987

Merged
merged 1 commit into from
Aug 8, 2019
Merged

fix workplan in permissionless #4987

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
5 changes: 3 additions & 2 deletions app/assets/v2/js/pages/bounty_details.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ var gitcoin_ize = function(key, val) {
if (!_truthy(val)) {
return [ null, null ];
}
return [ key, '<a href="https://gitcoin.co/profile/' + val + '" target="_blank" rel="noopener noreferrer">' + val.replace('@', '') + '</a>' ];
return [ key, '<a href="/profile/' + val + '" target="_blank" rel="noopener noreferrer">' + val.replace('@', '') + '</a>' ];
};

var email_ize = function(key, val) {
Expand Down Expand Up @@ -1576,7 +1576,8 @@ const process_activities = function(result, bounty_activities) {
token_value_time_peg_new: new_bounty.token_value_time_peg,
token_name: result['token_name'],
to_username: to_username,
kudos: kudos
kudos: kudos,
permission_type: result['permission_type']
});
});

Expand Down
2 changes: 1 addition & 1 deletion app/assets/v2/js/shared.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ var pull_interest_list = function(bounty_pk, callback) {
};

var profileHtml = function(handle, name) {
return '<span><a href="https://gitcoin.co/profile/' +
return '<span><a href="/profile/' +
handle + '" target="_blank">' + (name ? name : handle) + '</span></a>';
};

Expand Down
2 changes: 1 addition & 1 deletion app/dashboard/templates/bounty/details.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,7 @@ <h5 class="bounty-heading">{% trans "Funder" %}</h5>
<div class="col-12 col-md-2">
<div class="activity-time">[[:age]]</div>
</div>
[[if issue_message && activity_type == 'worker_applied']]
[[if issue_message && activity_type == 'worker_applied' || issue_message && permission_type == 'permissionless' && activity_type == 'start_work' ]]
<p class="bg-lightblue p-2 rounded mt-3 mb-0 w-100 overflow-auto" style="resize: vertical;height: 50px;word-break: break-word;white-space: pre-wrap;"><b>Work Plan:</b> [[:issue_message.issue_message]]</p>
[[/if]]
</div>
Expand Down