yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1169 from AndyButland/u4-7468

Browse Source 
Fixes U4 7468 - mis-assigned translator when sending to translation
This commit is contained in:
Mads Rasmussen
2016-05-17 13:18:15 +02:00
parent 4752a83135 e3411f7212
commit adebd4acd6
4 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Umbraco.Web.UI/umbraco/config/lang/en.xml
View File

@@ -1167,6 +1167,7 @@ To manage your website, simply open the Umbraco back office and start adding con
To close a translation task, please go to the Details view and click the "Close" button.
]]></key>
<key alias="pageHasBeenSendToTranslation">The page '%0%' has been send to translation</key>
<key alias="noLanguageSelected">Please select the language that the content should be translated into</key>
<key alias="sendToTranslate">Send the page '%0%' to translation</key>
<key alias="taskAssignedBy">Assigned by</key>
<key alias="taskOpened">Task opened</key>

1
src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
View File

@@ -1172,6 +1172,7 @@ To manage your website, simply open the Umbraco back office and start adding con
To close a translation task, please go to the Details view and click the "Close" button.
]]></key>
<key alias="pageHasBeenSendToTranslation">The page '%0%' has been send to translation</key>
<key alias="noLanguageSelected">Please select the language that the content should be translated into</key>
<key alias="sendToTranslate">Send the page '%0%' to translation</key>
<key alias="taskAssignedBy">Assigned by</key>
<key alias="taskOpened">Task opened</key>

34
src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/sendToTranslation.aspx.cs
View File

@@ -92,20 +92,30 @@ namespace umbraco.presentation.dialogs
protected void doTranslation_Click(object sender, EventArgs e)
{
// testing translate
cms.businesslogic.translation.Translation.MakeNew(
_currentPage,
getUser(),
BusinessLogic.User.GetUser(int.Parse(translator.SelectedValue)),
new cms.businesslogic.language.Language(int.Parse(language.SelectedValue)),
comment.Text, includeSubpages.Checked,
true);
int languageId;
if (int.TryParse(language.SelectedValue, out languageId))
{
cms.businesslogic.translation.Translation.MakeNew(
_currentPage,
getUser(),
BusinessLogic.User.GetUser(int.Parse(translator.SelectedValue)),
new cms.businesslogic.language.Language(languageId),
comment.Text, includeSubpages.Checked,
true);
pane_form.Visible = false;
pl_buttons.Visible = false;
pane_form.Visible = false;
pl_buttons.Visible = false;
feedback.Text = ui.Text("translation","pageHasBeenSendToTranslation", _currentPage.Text, base.getUser()) + "</p><p><a href=\"#\" onclick=\"" + ClientTools.Scripts.CloseModalWindow() + "\">" + ui.Text("defaultdialogs", "closeThisWindow") + "</a></p>";
feedback.type = uicontrols.Feedback.feedbacktype.success;
feedback.Text = ui.Text("translation", "pageHasBeenSendToTranslation", _currentPage.Text, base.getUser()) +
"</p><p><a href=\"#\" onclick=\"" + ClientTools.Scripts.CloseModalWindow() + "\">" +
ui.Text("defaultdialogs", "closeThisWindow") + "</a></p>";
feedback.type = uicontrols.Feedback.feedbacktype.success;
}
else
{
feedback.Text = ui.Text("translation", "noLanguageSelected");
feedback.type = uicontrols.Feedback.feedbacktype.error;
}
}
}
}

2
src/umbraco.cms/businesslogic/task/Task.cs
View File

@@ -131,7 +131,7 @@ namespace umbraco.cms.businesslogic.task
set
{
_user = value;
TaskEntity.OwnerUserId = _user.Id;
TaskEntity.AssigneeUserId = _user.Id;
}
}