diff --git a/src/main/java/com/rekoe/module/admin/AdminSvnUserAct.java b/src/main/java/com/rekoe/module/admin/AdminSvnUserAct.java index 58ed2d7..e38ec57 100644 --- a/src/main/java/com/rekoe/module/admin/AdminSvnUserAct.java +++ b/src/main/java/com/rekoe/module/admin/AdminSvnUserAct.java @@ -17,35 +17,35 @@ import com.rekoe.module.BaseAction; import com.rekoe.service.SvnUserService; @IocBean -@At("/admin/svn/user") +@At("/admin/project/group") public class AdminSvnUserAct extends BaseAction { @Inject - private SvnUserService svnUserService; + private SvnUserService projectUserService; @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); + return projectUserService.getObjListByPager(page, 20, null); } @At - @Ok("fm:template.admin.svn_user.add") - @RequiresPermissions({ "svn.user:add" }) + @Ok("fm:template.admin.project_user.add") + @RequiresPermissions({ "project.group:add" }) @PermissionTag(name = "SVN添加账号", tag = "SVN账号管理", enable = true) public void add() { } @At @Ok("json") - @RequiresPermissions("svn.user:add") + @RequiresPermissions("project.group:add") @PermissionTag(name = "SVN添加账号", tag = "SVN账号管理", enable = false) public Message o_save(@Param("::user.") Usr user, HttpServletRequest req) { - boolean isOk = svnUserService.nameOk(user.getUsr()); + boolean isOk = projectUserService.nameOk(user.getUsr()); if (isOk) { - isOk = svnUserService.insert(user); + isOk = projectUserService.insert(user); } if (isOk) { return Message.success("ok", req); diff --git a/src/main/webapp/WEB-INF/template/admin/svn_group/add.ftl b/src/main/webapp/WEB-INF/template/admin/project_group/add.ftl similarity index 100% rename from src/main/webapp/WEB-INF/template/admin/svn_group/add.ftl rename to src/main/webapp/WEB-INF/template/admin/project_group/add.ftl diff --git a/src/main/webapp/WEB-INF/template/admin/svn_group/edit.ftl b/src/main/webapp/WEB-INF/template/admin/project_group/edit.ftl similarity index 100% rename from src/main/webapp/WEB-INF/template/admin/svn_group/edit.ftl rename to src/main/webapp/WEB-INF/template/admin/project_group/edit.ftl diff --git a/src/main/webapp/WEB-INF/template/admin/svn_group/frame/left.ftl b/src/main/webapp/WEB-INF/template/admin/project_group/frame/left.ftl similarity index 84% rename from src/main/webapp/WEB-INF/template/admin/svn_group/frame/left.ftl rename to src/main/webapp/WEB-INF/template/admin/project_group/frame/left.ftl index ab15ef0..dbfaa43 100644 --- a/src/main/webapp/WEB-INF/template/admin/svn_group/frame/left.ftl +++ b/src/main/webapp/WEB-INF/template/admin/project_group/frame/left.ftl @@ -18,8 +18,8 @@ h3{ padding:0; margin:0; font-weight:normal; font-size:12px;} <#include "/template/admin/date.ftl"/> <ul class="w-lful"> <li><a href="${base}/admin/server/right" target="rightFrame"><@s.m "global.admin.index"/></a></li> - <@perm_chow perm="svn.group"> - <li><a href="${base}/admin/svn/group/list.rk" target="rightFrame">svn组列表</a></li> + <@perm_chow perm="project.group"> + <li><a href="${base}/admin/project/group/list.rk" target="rightFrame">svn组列表</a></li> </@perm_chow> </ul> </div> diff --git a/src/main/webapp/WEB-INF/template/admin/svn_group/frame/main.ftl b/src/main/webapp/WEB-INF/template/admin/project_group/frame/main.ftl similarity index 100% rename from src/main/webapp/WEB-INF/template/admin/svn_group/frame/main.ftl rename to src/main/webapp/WEB-INF/template/admin/project_group/frame/main.ftl diff --git a/src/main/webapp/WEB-INF/template/admin/svn_group/frame/right.ftl b/src/main/webapp/WEB-INF/template/admin/project_group/frame/right.ftl similarity index 100% rename from src/main/webapp/WEB-INF/template/admin/svn_group/frame/right.ftl rename to src/main/webapp/WEB-INF/template/admin/project_group/frame/right.ftl diff --git a/src/main/webapp/WEB-INF/template/admin/svn_group/list.ftl b/src/main/webapp/WEB-INF/template/admin/project_group/list.ftl similarity index 100% rename from src/main/webapp/WEB-INF/template/admin/svn_group/list.ftl rename to src/main/webapp/WEB-INF/template/admin/project_group/list.ftl