Commit bdebebe9 authored by Benedikt Heinrichs's avatar Benedikt Heinrichs
Browse files

Merge branch 'Topic/1294-contactChangeFunctionality' into 'Product/789-userContactEmail'

New: Add the Contact Changing functionality to the database and backend

See merge request !20
parents ebe6596b a5779a14
{
"version": 1,
"isRoot": true,
"tools": {
"gitversion.tool": {
"version": "5.6.6",
"commands": [
"dotnet-gitversion"
]
},
"dotnet-version-cli": {
"version": "2.1.1",
"commands": [
"dotnet-version"
]
}
}
}
\ No newline at end of file
......@@ -268,3 +268,6 @@ __pycache__/
tools/*
!tools/packages.config
dist/
# Dotnet Tool Manifest
.config/*
\ No newline at end of file
......@@ -123,7 +123,10 @@ namespace Coscine.Api.NotificationBus.Controllers
dict = ((JObject)(requestArgs["placeholder"])).ToObject<Dictionary<string, object>>();
}
dict.Add("_targetUserName", user.DisplayName);
dict.Add("_projectName", project.DisplayName);
if (project != null)
{
dict.Add("_projectName", project.DisplayName);
}
foreach (JProperty property in template.Properties())
{
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment