diff --git a/src/main/java/com/rekoe/module/admin/AdminProjectGroupAct.java b/src/main/java/com/rekoe/module/admin/AdminProjectGroupAct.java index 859aa00..b83e8f7 100644 --- a/src/main/java/com/rekoe/module/admin/AdminProjectGroupAct.java +++ b/src/main/java/com/rekoe/module/admin/AdminProjectGroupAct.java @@ -3,6 +3,7 @@ package com.rekoe.module.admin; import javax.servlet.http.HttpServletRequest; import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.nutz.dao.Cnd; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; import org.nutz.mvc.annotation.At; @@ -14,42 +15,44 @@ import com.rekoe.common.Message; import com.rekoe.common.page.Pagination; import com.rekoe.domain.Usr; import com.rekoe.module.BaseAction; -import com.rekoe.service.SvnUserService; +import com.rekoe.service.ProjectGroupService; @IocBean -@At("/admin/svn/user") +@At("/admin/project/group") public class AdminProjectGroupAct extends BaseAction { @Inject - private SvnUserService svnUserService; + private ProjectGroupService projectGroupService; @At - @Ok("fm:template.admin.svn_user.list") - @RequiresPermissions({ "svn.user:view" }) + @Ok("fm:template.admin.project_group.list") + @RequiresPermissions({ "project.group:view" }) @PermissionTag(name = "SVN浏览账号", tag = "SVN账号管理") - public Pagination list(@Param(value = "pageNumber", df = "1") int page) { - return svnUserService.getObjListByPager(page, 20, null); + public Pagination list(@Param(value = "pageNumber", df = "1") int page, @Param("pj") String pj) { + return projectGroupService.getObjListByPager(page, 20, Cnd.where("pj", "=", pj)); } @At - @Ok("fm:template.admin.svn_user.add") - @RequiresPermissions({ "svn.user:add" }) - @PermissionTag(name = "SVN添加账号", tag = "SVN账号管理", enable = true) + @Ok("fm:template.admin.project_group.add") + @RequiresPermissions({ "project.group:add" }) + @PermissionTag(name = "添加项目用户组", tag = "SVN账号管理", enable = true) public void add() { } @At @Ok("json") - @RequiresPermissions("svn.user:add") - @PermissionTag(name = "SVN添加账号", tag = "SVN账号管理", enable = false) - public Message o_save(@Param("::user.") Usr user, HttpServletRequest req) { - boolean isOk = svnUserService.nameOk(user.getUsr()); - if (isOk) { - isOk = svnUserService.insert(user); - } - if (isOk) { - return Message.success("ok", req); - } + @RequiresPermissions("project.group:add") + @PermissionTag(name = "添加项目用户组", tag = "SVN账号管理", enable = false) + public Message o_save(@Param("::group.") Usr group, HttpServletRequest req) { return Message.error("error", req); } + + @At + @Ok("json") + @RequiresPermissions("project.group:delete") + @PermissionTag(name = "删除项目用户组", tag = "SVN账号管理", enable = true) + public Message delete(@Param("pj") String pj, @Param("gr") String gr, HttpServletRequest req) { + projectGroupService.delete(pj, gr); + return Message.success("ok", req); + } } diff --git a/src/main/java/com/rekoe/service/ProjectGroupService.java b/src/main/java/com/rekoe/service/ProjectGroupService.java index 9cf343b..cf03477 100644 --- a/src/main/java/com/rekoe/service/ProjectGroupService.java +++ b/src/main/java/com/rekoe/service/ProjectGroupService.java @@ -78,4 +78,18 @@ public class ProjectGroupService extends BaseService { sql.setCondition(Cnd.where("pj", "=", pj)); dao().execute(sql); } + + /** + * 删除 + * + * @param pj + * 项目 + * @param gr + * 组 + */ + public void delete(String pj, String gr) { + Sql sql = Sqls.create("delete from pj_gr");// where pj = ? and gr=?"; + sql.setCondition(Cnd.where("pj", "=", pj).and("gr", "=", gr)); + dao().execute(sql); + } } diff --git a/src/main/java/com/rekoe/service/SvnService.java b/src/main/java/com/rekoe/service/SvnService.java index 6876f19..cf63af1 100644 --- a/src/main/java/com/rekoe/service/SvnService.java +++ b/src/main/java/com/rekoe/service/SvnService.java @@ -78,7 +78,7 @@ public class SvnService { } File parent = new File(pj.getPath()); if (!parent.exists() || !parent.isDirectory()) { - throw new RuntimeException(String.format("找不到仓库 路径{0}", new Object[] { pj.getPath() })); + throw new RuntimeException(String.format("找不到仓库 路径 %s", pj.getPath())); } if (Constants.HTTP.equalsIgnoreCase(pj.getType())) {// HTTP(单库) SVNPath this.exportHTTP(pj); diff --git a/src/main/webapp/WEB-INF/template/admin/project/list.ftl b/src/main/webapp/WEB-INF/template/admin/project/list.ftl index 56db0a5..454d7d0 100644 --- a/src/main/webapp/WEB-INF/template/admin/project/list.ftl +++ b/src/main/webapp/WEB-INF/template/admin/project/list.ftl @@ -21,18 +21,20 @@ function getTableForm() {
<@p.form id="tableForm" method="post"> <@p.hidden name="pageNumber" value="${pageNo!}" /> -<@p.table value=obj;user,i,has_next><#rt/> +<@p.table value=obj;project,i,has_next><#rt/> <@p.column title="ID" align="center">${i+1}<#t/> - <@p.column title="姓名" align="center">${user.pj}<#t/> - <@p.column title="路径" align="center">${user.path}<#t/> - <@p.column title="URL" align="center">${user.url}<#t/> - <@p.column title="类型" align="center">${user.type}<#t/> - <@p.column title="描述" align="center">${user.des}<#t/> - <@p.column title="设置用户组" align="center">设置用户组<#t/> - <@p.column title="设置权限" align="center">设置权限<#t/> + <@p.column title="姓名" align="center">${project.pj}<#t/> + <@p.column title="路径" align="center">${project.path}<#t/> + <@p.column title="URL" align="center">${project.url}<#t/> + <@p.column title="类型" align="center">${project.type}<#t/> + <@p.column title="描述" align="center">${project.des}<#t/> + <@shiro.hasPermission name="project.group"> + <@p.column title="设置用户组" align="center">设置用户组<#t/> + + <@p.column title="设置权限" align="center">设置权限<#t/> <@shiro.hasPermission name="svn.project:auth.manager"> <@p.column title="编辑" align="center"> - 删除<#rt/> + 删除<#rt/> <#t/> diff --git a/src/main/webapp/WEB-INF/template/admin/project_group/list.ftl b/src/main/webapp/WEB-INF/template/admin/project_group/list.ftl index f95522e..46506d8 100644 --- a/src/main/webapp/WEB-INF/template/admin/project_group/list.ftl +++ b/src/main/webapp/WEB-INF/template/admin/project_group/list.ftl @@ -8,6 +8,31 @@ function getTableForm() { return document.getElementById('tableForm'); } +function deleted(pj,gr){ + $.dialog({ + type: "warn", + content: '确定要删除此记录?', + ok: 'Ok', + cancel: 'Cancel', + onOk: function() { + $.ajax({ + url: "delete.rk", + type: "POST", + data: {"pj":pj,"gr":gr}, + dataType: "json", + cache: false, + success: function(message) { + $.message(message); + if (message.type == "success") + { + window.location.href = back; + } + } + }); + } + }); + return false; +} @@ -21,14 +46,15 @@ function getTableForm() {
<@p.form id="tableForm" method="post"> <@p.hidden name="pageNumber" value="${pageNo!}" /> -<@p.table value=obj;user,i,has_next><#rt/> +<@p.table value=obj;group,i,has_next><#rt/> <@p.column title="ID" align="center">${i+1}<#t/> - <@p.column title="姓名" align="center">${user.name}<#t/> - <@p.column title="名称" align="center">${user.usr}<#t/> - <@p.column title="email" align="center">${user.email!}<#t/> - <@shiro.hasPermission name="svn.user:edit"> - <@p.column title="编辑" align="center"> - 编辑<#rt/> + <@p.column title="项目" align="center">${group.pj}<#t/> + <@p.column title="用户组" align="center">${group.gr}<#t/> + <@p.column title="描述" align="center">${group.des!}<#t/> + <@p.column title="设置用户" align="center">设置用户<#t/> + <@shiro.hasPermission name="project.group:delete"> + <@p.column title="删除" align="center"> + <#if group.gr != "manager">删除<#rt/> <#t/>