feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Gerrit: Store full user details in server

Browse Source 
This is needed for REST, which never returns user name (only account id,
full name and email)

Change-Id: Ia4e3cca15a80a26b26f5f69edfc83a18e4c1fa1b
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Orgad Shaneh
2017-02-25 22:24:45 +02:00
committed by Orgad Shaneh
parent bae0f1406e
commit 0995cf22ab
6 changed files with 32 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/git/gerrit/gerritmodel.cpp
View File

@@ -169,10 +169,10 @@ QString GerritPatchSet::approvalsColumn() const
return result;
}
bool GerritPatchSet::hasApproval(const QString &userName) const
bool GerritPatchSet::hasApproval(const GerritUser &user) const
{
return Utils::contains(approvals, [&userName](const GerritApproval &a) {
return a.reviewer.userName == userName;
return Utils::contains(approvals, [&user](const GerritApproval &a) {
return a.reviewer.isSameAs(user);
});
}
@@ -501,7 +501,7 @@ void GerritModel::refresh(const QSharedPointer<GerritServer> &server, const QStr
QString realQuery = query.trimmed();
if (realQuery.isEmpty()) {
realQuery = "status:open";
const QString user = m_server->user;
const QString user = m_server->user.userName;
if (!user.isEmpty())
realQuery += QString(" (owner:%1 OR reviewer:%1)").arg(user);
}
@@ -693,11 +693,11 @@ QList<QStandardItem *> GerritModel::changeToRow(const GerritChangePtr &c) const
row[ApprovalsColumn]->setText(c->currentPatchSet.approvalsColumn());
// Mark changes awaiting action using a bold font.
bool bold = false;
if (c->owner.userName == m_server->user) { // Owned changes: Review != 0,1. Submit or amend.
if (c->owner.isSameAs(m_server->user)) { // Owned changes: Review != 0,1. Submit or amend.
const int level = c->currentPatchSet.approvalLevel();
bold = level != 0 && level != 1;
} else { // Changes pending for review: No review yet.
bold = !m_server->user.isEmpty() && !c->currentPatchSet.hasApproval(m_server->user);
bold = !c->currentPatchSet.hasApproval(m_server->user);
}
if (bold) {
QFont font = row.first()->font();