mirror of https://github.com/Rekoe/rk_svnadmin
fix
parent
3b035cdd00
commit
a2f7614b14
|
@ -19,6 +19,7 @@ import com.rekoe.domain.Pj;
|
||||||
import com.rekoe.domain.ProjectConfig;
|
import com.rekoe.domain.ProjectConfig;
|
||||||
import com.rekoe.domain.User;
|
import com.rekoe.domain.User;
|
||||||
import com.rekoe.domain.Usr;
|
import com.rekoe.domain.Usr;
|
||||||
|
import com.rekoe.service.ProjectConfigService;
|
||||||
import com.rekoe.service.UserService;
|
import com.rekoe.service.UserService;
|
||||||
|
|
||||||
import freemarker.template.Configuration;
|
import freemarker.template.Configuration;
|
||||||
|
@ -65,6 +66,7 @@ public class MvcSetup implements Setup {
|
||||||
}
|
}
|
||||||
UserService userService = ioc.get(UserService.class);
|
UserService userService = ioc.get(UserService.class);
|
||||||
userService.initFormPackages("com.rekoe");
|
userService.initFormPackages("com.rekoe");
|
||||||
|
ioc.get(ProjectConfigService.class).init();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -9,7 +9,6 @@ import javax.servlet.http.HttpServletResponse;
|
||||||
|
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
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.Inject;
|
||||||
import org.nutz.ioc.loader.annotation.IocBean;
|
import org.nutz.ioc.loader.annotation.IocBean;
|
||||||
import org.nutz.lang.util.NutMap;
|
import org.nutz.lang.util.NutMap;
|
||||||
|
@ -56,6 +55,14 @@ public class AdminProjectAct extends BaseAction {
|
||||||
public void add() {
|
public void add() {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@At
|
||||||
|
@Ok("fm:template.admin.project.edit")
|
||||||
|
@RequiresPermissions({ "svn.project:edit" })
|
||||||
|
@PermissionTag(name = "SVN编辑项目", tag = "SVN项目管理", enable = false)
|
||||||
|
public Pj edit(@Param("pj") String pj) {
|
||||||
|
return projectService.get(pj);
|
||||||
|
}
|
||||||
|
|
||||||
@At
|
@At
|
||||||
@Ok("json")
|
@Ok("json")
|
||||||
@RequiresPermissions("svn.project:add")
|
@RequiresPermissions("svn.project:add")
|
||||||
|
@ -76,7 +83,7 @@ public class AdminProjectAct extends BaseAction {
|
||||||
@Ok("fm:template.admin.project.rep")
|
@Ok("fm:template.admin.project.rep")
|
||||||
@RequiresPermissions({ "svn.project:view" })
|
@RequiresPermissions({ "svn.project:view" })
|
||||||
public String rep(@Param("pj") String pj, HttpServletRequest req) {
|
public String rep(@Param("pj") String pj, HttpServletRequest req) {
|
||||||
Pj project = projectService.fetch(Cnd.where("pj", "=", pj));
|
Pj project = projectService.get(pj);
|
||||||
String root = repositoryService.getRepositoryRoot(project);
|
String root = repositoryService.getRepositoryRoot(project);
|
||||||
String svnUrl = RepositoryService.parseURL(projectConfigService.getProjectUrl(pj));
|
String svnUrl = RepositoryService.parseURL(projectConfigService.getProjectUrl(pj));
|
||||||
String path = "/";
|
String path = "/";
|
||||||
|
@ -202,4 +209,14 @@ public class AdminProjectAct extends BaseAction {
|
||||||
}
|
}
|
||||||
return Message.error("erroe", req);
|
return Message.error("erroe", req);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@At
|
||||||
|
@Ok("json")
|
||||||
|
@RequiresPermissions("svn.project:update")
|
||||||
|
@PermissionTag(name = "SVN编辑项目", tag = "SVN项目管理", enable = true)
|
||||||
|
public Message o_update(@Param("::pj.") Pj pj, HttpServletRequest req) {
|
||||||
|
projectService.update(pj);
|
||||||
|
return Message.success("ok", req);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,7 +13,7 @@ import com.rekoe.domain.ProjectConfig;
|
||||||
* http://www.rekoe.com<br/>
|
* http://www.rekoe.com<br/>
|
||||||
* QQ:5382211
|
* QQ:5382211
|
||||||
*/
|
*/
|
||||||
@IocBean(args = { "refer:dao" }, create = "init")
|
@IocBean(args = { "refer:dao" })
|
||||||
public class ProjectConfigService extends BaseService<ProjectConfig> {
|
public class ProjectConfigService extends BaseService<ProjectConfig> {
|
||||||
|
|
||||||
public ProjectConfigService(Dao dao) {
|
public ProjectConfigService(Dao dao) {
|
||||||
|
|
|
@ -148,4 +148,8 @@ public class ProjectService extends BaseService<Pj> {
|
||||||
svnService.exportConfig(pj);
|
svnService.exportConfig(pj);
|
||||||
delete(pj);
|
delete(pj);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void update(Pj pj) {
|
||||||
|
dao().update(pj);
|
||||||
|
}
|
||||||
}
|
}
|
Loading…
Reference in New Issue