Skip to content

Commit 91ef648

Browse files
committed
Added documentation for getting started
1 parent c6cf374 commit 91ef648

17 files changed

+189
-34
lines changed
Binary file not shown.

API/Multi-Language.DataApi/DBBackups/DESKTOP-03QQJDH_api_1.0.0.0_20170101_072827.bak renamed to API/Multi-Language.DataApi/DBBackups/DESKTOP-03QQJDH_api_1.0.0.0_20170107_092553.bak

7.4 MB
Binary file not shown.

Admin/Multi-Language.MVCClient/App_Start/BundleConfig.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public static void RegisterBundles(BundleCollection bundles)
4848
"~/Scripts/MltApi/Settings/iCheck-Settings.js",
4949
"~/Scripts/MltApi/Settings/InputFile-Settings.js",
5050

51-
51+
"~/Scripts/MltApi/PagesHelpers/MltApi-DocMultiLanguage.js",
5252
"~/Content/bootstrap-fileinput/themes/fa/theme.js"));
5353

5454
bundles.Add(new StyleBundle("~/Content/css").Include(

Admin/Multi-Language.MVCClient/App_Start/FilterConfig.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ public class FilterConfig
99
public static void RegisterGlobalFilters(GlobalFilterCollection filters)
1010
{
1111
filters.Add(new CatchErrorAttribute());
12+
filters.Add(new ValidationActionFilterAttribute());
1213
}
1314
}
1415
}
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Linq;
4+
using System.Net;
5+
using System.Net.Http;
6+
using System.Web;
7+
using System.Web.Http.Controllers;
8+
using System.Web.Mvc;
9+
10+
namespace Multi_Language.MVCClient.Attributes
11+
{
12+
public class ValidationActionFilterAttribute : ActionFilterAttribute
13+
{
14+
}
15+
}

Admin/Multi-Language.MVCClient/Controllers/BaseController.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ public void SetViewBagsAndHeaders(bool isAjax, string ContentHeader, string Cont
4747
ViewBag.ContentDescription = ContentDescription;
4848
}
4949

50+
51+
5052
}
5153

5254
}

Admin/Multi-Language.MVCClient/Controllers/MultiLanguage/ContextsController.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ public ActionResult Create(PhrasesContextViewModel model)
5050
{
5151
if (!ModelState.IsValid)
5252
{
53+
Response.Headers["InvalidModel"] = "false";
54+
5355
SetViewBagsAndHeaders(Request.IsAjaxRequest(), "Add new context", "You have some validation errors.");
5456
if (Request.IsAjaxRequest())
5557
return PartialView(model);

Admin/Multi-Language.MVCClient/Controllers/MultiLanguage/LanguagesController.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ public ActionResult Create(LanguagesViewModels model)
4747
{
4848
if (!ModelState.IsValid)
4949
{
50+
51+
Response.Headers["InvalidModel"] = "false";
52+
5053
SetViewBagsAndHeaders(Request.IsAjaxRequest(), "Add new language", "You have some validation errors.");
5154
if (Request.IsAjaxRequest())
5255
return PartialView(model);

Admin/Multi-Language.MVCClient/Controllers/MultiLanguage/ResourcesController.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ public ActionResult Create([Bind(Include = "IdPhrase,IdPhraseContext,IdLanguage,
8181

8282
if (!ModelState.IsValid)
8383
{
84+
Response.Headers["InvalidModel"] = "false";
8485

8586
SetViewBagsAndHeaders(Request.IsAjaxRequest(), "Add new resource", "You have some validation errors.");
8687
if (Request.IsAjaxRequest())

Admin/Multi-Language.MVCClient/Controllers/ProjectsController.cs

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ namespace Multi_Language.MVCClient.Controllers
2020
{
2121
public class ProjectsController : BaseController
2222
{
23-
private IProjectsServices projectServices;
23+
private readonly IProjectsServices projectServices;
24+
2425

2526

26-
2727

2828
public ProjectsController(IProjectsServices projectServices)
2929
{
@@ -56,6 +56,9 @@ public ActionResult Create(ProjectsViewModel model)
5656
{
5757
if (!ModelState.IsValid)
5858
{
59+
// TODO Return error code instead of header
60+
//Response.StatusCode = 404;
61+
Response.Headers["InvalidModel"] = "false";
5962
SetViewBagsAndHeaders(Request.IsAjaxRequest(), "Add new project", "You have some validation errors.");
6063
if (Request.IsAjaxRequest())
6164
return PartialView(model);
@@ -70,22 +73,26 @@ public ActionResult Create(ProjectsViewModel model)
7073
model.DateCreated = DateTime.Now;
7174
model.UserId = userId;
7275
projectServices.Add(Mapper.Map<Projects>(model));
73-
var projectId = projectServices.GetForUser(User.Identity.GetUserId()).OrderByDescending(m => m.DateCreated).Where(p => p.UserId == userId).FirstOrDefault().IdProject;
74-
75-
if (User.Identity.GetActiveProject() == "0")
76+
var firstOrDefault = projectServices.GetForUser(User.Identity.GetUserId()).OrderByDescending(m => m.DateCreated).FirstOrDefault(p => p.UserId == userId);
77+
if (firstOrDefault != null)
7678
{
79+
var projectId = firstOrDefault.IdProject;
7780

78-
var user = UserManager.FindById(User.Identity.GetUserId());
81+
if (User.Identity.GetActiveProject() == "0")
82+
{
7983

80-
user.ActiveProject = projectId;
84+
var user = UserManager.FindById(User.Identity.GetUserId());
8185

82-
IdentityResult result = UserManager.Update(user);
83-
Response.Headers["ProjectIsChanged"] = projectId.ToString();
84-
}
85-
else
86-
{
87-
Response.Headers["ProjectDropDownIsChanged"] = projectId.ToString();
86+
user.ActiveProject = projectId;
87+
88+
IdentityResult result = UserManager.Update(user);
89+
Response.Headers["ProjectIsChanged"] = projectId.ToString();
90+
}
91+
else
92+
{
93+
Response.Headers["ProjectDropDownIsChanged"] = projectId.ToString();
8894

95+
}
8996
}
9097
if (Request.IsAjaxRequest())
9198
return PartialView("Index", projectServices.GetForUser(User.Identity.GetUserId()).ProjectTo<ProjectsViewModel>());

0 commit comments

Comments
 (0)