lsm/OpenAuth.Net
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/OpenAuth.Net.git synced 2025-09-19 18:22:11 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'workflow'

Browse Source
This commit is contained in:
yubaolee
2016-09-12 09:41:49 +08:00
parent a274030625 0269a4f194
commit e7aa36e83a
23 changed files with 111 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenAuth.Mvc/BllScripts/assignModuleElement.js
View File

@@ -53,6 +53,7 @@ function DialogList() {
var url = '/ModuleElementManager/LoadWithAccess?tId=';
this.maingrid = $.CurrentDialog.find('#maingrid').datagrid({
showToolbar: false,
loadType: 'GET',
filterThead: false,
target: $(this),
columns: [

1
OpenAuth.Mvc/BllScripts/assignRes.js
View File

@@ -56,6 +56,7 @@ function DialogList() {
var url = '/ResourceManager/LoadWithAccess?cId=';
this.maingrid = $.CurrentDialog.find('#maingrid').datagrid({
showToolbar: false,
loadType: 'GET',
filterThead: false,
target: $(this),
columns: [

5
OpenAuth.Mvc/BllScripts/categoryManager.js
View File

@@ -17,6 +17,7 @@ function MainGrid() {
var selectedId = '00000000-0000-0000-0000-000000000000'; //ztree选中的模块
this.maingrid = $('#maingrid').datagrid({
showToolbar: false,
loadType: 'GET',
filterThead: false,
target: $(this),
columns: [
@@ -234,7 +235,7 @@ function del() {
var selected = list.getSelectedObj();
if (selected == null) return;
$.getJSON('/CategoryManager/Delete?Id=' + selected.Id, function (data) {
$.post('/CategoryManager/Delete?Id=' + selected.Id, function (data) {
if (data.statusCode == "200") {
list.reload();
ztree.reload();
@@ -242,7 +243,7 @@ function del() {
else {
$(this).alertmsg('warn', data.message);
}
});
}, "json");
}
//编辑

5
OpenAuth.Mvc/BllScripts/commonApply.js
View File

@@ -27,6 +27,7 @@ function MainGrid() {
var selectedNode = 'me';
this.maingrid = $('#maingrid').datagrid({
showToolbar: false,
loadType:'GET',
filterThead: false,
target: $(this),
columns: [
@@ -115,14 +116,14 @@ function del() {
var selected = list.getSelectedObj();
if (selected == null) return;
$.getJSON('/CommonApplies/Delete?Id=' + selected.Id, function (data) {
$.post('/CommonApplies/Delete?Id=' + selected.Id, function (data) {
if (data.statusCode == "200") {
list.reload();
}
else {
$(this).alertmsg('warn', data.message);
}
});
}, "json");
}
//自定义的编辑按钮

5
OpenAuth.Mvc/BllScripts/modulemanager.js
View File

@@ -19,6 +19,7 @@ function MainGrid() {
this.maingrid = $('#maingrid').datagrid({
showToolbar: false,
filterThead: false,
loadType: 'GET',
target: $(this),
columns: [
{
@@ -262,7 +263,7 @@ function del() {
var selected = list.getSelectedObj();
if (selected == null) return;
$.getJSON('/moduleManager/Delete?Id=' + selected.Id, function (data) {
$.post('/moduleManager/Delete?Id=' + selected.Id, function (data) {
if (data.statusCode == "200") {
list.reload();
ztree.reload();
@@ -270,7 +271,7 @@ function del() {
else {
$(this).alertmsg('warn', data.message);
}
});
}, "json");
}
//自定义的编辑按钮

5
OpenAuth.Mvc/BllScripts/orgManager.js
View File

@@ -48,6 +48,7 @@ function MainGrid() {
this.maingrid = $('#maingrid').datagrid({
showToolbar: false,
filterThead: false,
loadType: 'GET',
target: $(this),
columns: [
{
@@ -236,7 +237,7 @@ function del() {
var selected = list.getSelectedObj();
if (selected == null) return;
$.getJSON('/OrgManager/DelOrg?Id=' + selected.Id, function (data) {
$.post('/OrgManager/DelOrg?Id=' + selected.Id, function (data) {
if (data.statusCode == "200") {
list.reload();
ztree.reload();
@@ -244,7 +245,7 @@ function del() {
else {
$(this).alertmsg('warn', data.message);
}
});
}, "json");
}
//自定义的编辑按钮

9
OpenAuth.Mvc/BllScripts/processDetail.js
View File

@@ -38,8 +38,13 @@ $(function () {
.on("click", function () { //执行命令
$.post("/CommonApplies/ExeCmd?id=" +$("#processId").val() +"&cmd=" +$(this).val() ,
function (data) {
BJUI.dialog('refresh', 'detailDlg');
});
if (data.statusCode == "200") {
BJUI.dialog('refresh', 'detailDlg');
}
else {
$(this).alertmsg('warn', data.message);
}
},'json');
});
});

5
OpenAuth.Mvc/BllScripts/resourceManager.js
View File

@@ -6,6 +6,7 @@ function MainGrid() {
this.maingrid = $('#maingrid').datagrid({
showToolbar: false,
filterThead: false,
loadType: 'GET',
target: $(this),
columns: [
{
@@ -219,7 +220,7 @@ function del() {
var selected = list.getSelectedObj();
if (selected == null) return;
$.getJSON('/ResourceManager/Delete?Id=' + selected.Id, function (data) {
$.post('/ResourceManager/Delete?Id=' + selected.Id, function (data) {
if (data.statusCode == "200") {
list.reload();
ztree.reload();
@@ -227,7 +228,7 @@ function del() {
else {
$(this).alertmsg('warn', data.message);
}
});
}, "json");
}
//自定义的编辑按钮

5
OpenAuth.Mvc/BllScripts/roleManager.js
View File

@@ -48,6 +48,7 @@ function MainGrid() {
this.maingrid = $('#maingrid').datagrid({
showToolbar: false,
filterThead: false,
loadType: 'GET',
target: $(this),
columns: [
{
@@ -217,7 +218,7 @@ function del() {
var selected = list.getSelectedObj();
if (selected == null) return;
$.getJSON('/RoleManager/Delete?Id=' + selected.Id, function (data) {
$.post('/RoleManager/Delete?Id=' + selected.Id, function (data) {
if (data.statusCode == "200") {
list.reload();
orgtree.reload();
@@ -225,7 +226,7 @@ function del() {
else {
$(this).alertmsg('warn', data.message);
}
});
}, "json");
}
//自定义的编辑按钮

5
OpenAuth.Mvc/BllScripts/stockManager.js
View File

@@ -47,6 +47,7 @@ function MainGrid() {
this.maingrid = $('#maingrid').datagrid({
showToolbar: false,
filterThead: false,
loadType: 'GET',
target: $(this),
columns: [
{
@@ -231,7 +232,7 @@ function del() {
var selected = list.getSelectedObj();
if (selected == null) return;
$.getJSON('/StockManager/Delete?Id=' + selected.Id, function (data) {
$.post('/StockManager/Delete?Id=' + selected.Id, function (data) {
if (data.statusCode == "200") {
list.reload();
ztree.reload();
@@ -239,7 +240,7 @@ function del() {
else {
$(this).alertmsg('warn', data.message);
}
});
}, "json");
}
//自定义的编辑按钮

1
OpenAuth.Mvc/BllScripts/userRoleManager.js
View File

@@ -43,6 +43,7 @@ function UserRolesList() {
var selectedId = '00000000-0000-0000-0000-000000000000'; //ztree选中的模块
this.maingrid = $.CurrentDialog.find('#maingrid').datagrid({
showToolbar: false,
loadType: 'GET',
filterThead: false,
target: $(this),
columns: [

7
OpenAuth.Mvc/BllScripts/usermanager.js
View File

@@ -49,6 +49,7 @@ function MainGrid() {
showToolbar: false,
filterThead: false,
target: $(this),
loadType: 'GET',
columns: [
{
name: 'Id',
@@ -228,7 +229,7 @@ function del() {
var selected = list.getSelectedObj();
if (selected == null) return;
$.getJSON('/UserManager/Delete?Id=' + selected.Id, function (data) {
$.post('/UserManager/Delete?Id=' + selected.Id, function (data) {
if (data.statusCode == "200") {
list.reload();
maintree.reload();
@@ -236,9 +237,11 @@ function del() {
else {
$(this).alertmsg('warn', data.message);
}
});
}, "json");
}
//自定义的编辑按钮
function edit() {
var selected = list.getSelectedObj();

12
OpenAuth.Mvc/Controllers/BaseController.cs
View File

@@ -34,7 +34,7 @@ namespace OpenAuth.Mvc.Controllers
{
base.OnActionExecuting(filterContext);
if (!AuthUtil.CheckLogin()) return;
if (!AuthUtil.CheckLogin()) return;
var controllername = Request.RequestContext.RouteData.Values["controller"].ToString().ToLower();
var actionname = filterContext.ActionDescriptor.ActionName.ToLower();
@@ -57,15 +57,11 @@ namespace OpenAuth.Mvc.Controllers
}
var version = ConfigurationManager.AppSettings["version"];
if (version == "demo")
if (version == "demo" && Request.HttpMethod == "POST")
{
HttpPostAttribute hobbyAttr = (HttpPostAttribute)Attribute.GetCustomAttribute(function, typeof(HttpPostAttribute));
if (actionname.Contains("del") || hobbyAttr != null) //客户端提交数据
{
throw new HttpException(400, "演示版本，不能进行该操作，当前模块:" + controllername +"/" +actionname);
}
throw new HttpException(400, "演示版本，不能进行该操作，当前模块:" + controllername + "/" + actionname);
}
}
}
}

4
OpenAuth.Mvc/Controllers/CommonAppliesController.cs
View File

@@ -13,6 +13,10 @@ using ProcessStatus = OptimaJet.Workflow.Core.Persistence.ProcessStatus;
namespace OpenAuth.Mvc.Controllers
{
/// <summary>
/// 通用申请流程处理
/// <para>李玉宝新增于2016-09-08 19:21:59</para>
/// </summary>
public class CommonAppliesController : BaseController
{
private CommonApplyApp _app;

2
OpenAuth.Mvc/Controllers/DesignerController.cs
View File

@@ -16,7 +16,7 @@ using WorkflowRuntime = OptimaJet.Workflow.Core.Runtime.WorkflowRuntime;
namespace OpenAuth.Mvc.Controllers
{
public class DesignerController : Controller
public class DesignerController : BaseController
{
public ActionResult Index(string schemeName)
{

2
OpenAuth.Mvc/Controllers/RoleManagerController.cs
View File

@@ -81,12 +81,14 @@ namespace OpenAuth.Mvc.Controllers
return JsonHelper.Instance.Serialize(_app.LoadForOrgAndUser(orgId, userId));
}
[System.Web.Mvc.HttpPost]
public string AccessRoles(Guid userId, Guid[] ids)
{
_app.AccessRole(userId, ids);
return JsonHelper.Instance.Serialize(BjuiResponse);
}
[System.Web.Mvc.HttpPost]
public string DelAccessRoles(Guid userId, Guid[] ids)
{
_app.DelAccessRole(userId, ids);