diff --git a/src/forge/Component/Releases.jsx b/src/forge/Component/Releases.jsx
index 3ed27867b..260e6bd2d 100644
--- a/src/forge/Component/Releases.jsx
+++ b/src/forge/Component/Releases.jsx
@@ -2,7 +2,7 @@ import React from 'react';
import { AlignTop } from '../Component/layout';
import { Link } from 'react-router-dom';
-function Releases({owner,projectsId,releaseVersions , baseOperate , projectType}){
+function Releases({ owner, projectsId, releaseVersions, distribution }) {
return(
@@ -27,7 +27,8 @@ function Releases({owner,projectsId,releaseVersions , baseOperate , projectType}
})
:
- 您暂未发布任何版本{baseOperate && projectType !==2 && 创建新版本}
+ 您暂未发布任何版本
+ {distribution && 创建新版本}
}
diff --git a/src/forge/Main/CoderDepot.jsx b/src/forge/Main/CoderDepot.jsx
index a7e136919..2efec3940 100644
--- a/src/forge/Main/CoderDepot.jsx
+++ b/src/forge/Main/CoderDepot.jsx
@@ -67,14 +67,15 @@ function CoderDepot(props){
const [ editReadme , setEditReadme ] = useState(false);
const [ pullsFlag , setPullsFlag ] = useState(true);
const [ issuesFlag , setIssuesFlag ] = useState(true);
- const [ releaseVersions , setReleaseVersions] = useState(undefined);
- const details = props.projectDetail;
const owner = props.match.params.owner;
const projectsId = props.match.params.projectsId;
let branchName = props.match.params.branchName;
branchName = returnbar(branchName);
+ const details = props.projectDetail;
let pathname = props.history.location.pathname;
+ //distribution:判断此用户是否可以创建发行版
+ const distribution = details && details.type != 2 && (details.permission === "Admin" || details.permission === "Owner" || details.permission === "Manager");
const { bannerList } = props;
useEffect(()=>{
@@ -90,6 +91,7 @@ function CoderDepot(props){
}
},[bannerList])
+
useEffect(()=>{
if(details){
setProjectDetail(details);
@@ -99,7 +101,7 @@ function CoderDepot(props){
setDefaultBranch(details.default_branch);
setInviteCode(details.invite_code);
}
- })
+ },[details])
useEffect(()=>{
if(treeValue){
@@ -118,30 +120,39 @@ function CoderDepot(props){
setTreeValue(url);
getFileInfo(url,branchName);
setType("file");
+ getReadmeInfo(url,branchName);
}else{
setTreeValue(undefined);
getDirInfo(branchName || defaultBranch);
setType("dir");
+ getReadmeInfo('', branchName || defaultBranch);
}
}
},[projectsId,owner,pathname,defaultBranch])
- useEffect(()=>{
- axios.get(`/${owner}/${projectsId}/releases.json`).then((result)=>{
- if(result && result.data){
- const release = {
- "list":result.data.releases,
- "total_count":result.data.releases.length
- }
- setReleaseVersions(release);
+ // 获取readme信息
+ function getReadmeInfo(path, ref) {
+ axios.get(`/${owner}/${projectsId}/readme.json`, {
+ params:{
+ owner: owner,
+ repo: projectsId,
+ filepath:path,
+ ref:ref || branchName
+ }
+ }).then((result) => {
+ if (result) {
+ setReadme(result.data);
+ } else {
+ setReadme(undefined);
}
})
- },[])
+ }
// 获取主目录列表
function getDirInfo(branch){
setIsSpin(true);
const url = `/${owner}/${projectsId}/entries.json`;
+
axios.get(url, {
params: { ref: branch }
}).then((result) => {
@@ -156,7 +167,7 @@ function CoderDepot(props){
setLastCommitAuthor(c && c.committer);
setMainFlag(true);
setReadOnly(true);
- setReadme(result.data.readme);
+ // setReadme(result.data.readme);
setEditReadme(false);
setHide(true);
}
@@ -186,7 +197,6 @@ function CoderDepot(props){
}
}).then((result) => {
if (result) {
- console.log(result)
let en = result.data.entries;
if(en.type){
setDirInfo(undefined);
@@ -201,7 +211,7 @@ function CoderDepot(props){
setLastCommit(c && c.commit);
setLastCommitAuthor(c && c.committer);
setMainFlag(false);
- setReadme(result.data.readme)
+ // setReadme(result.data.readme);
setReadOnly(true);
setReadOnly(!editReadme);
setHide(true);
@@ -532,16 +542,15 @@ function CoderDepot(props){
}
{/* 发布 */}
{
- releaseVersions &&
+ projectDetail && projectDetail.release_versions &&
}
diff --git a/src/forge/Main/CoderRootCommit.js b/src/forge/Main/CoderRootCommit.js
index ab1a0fc36..cdd8597af 100644
--- a/src/forge/Main/CoderRootCommit.js
+++ b/src/forge/Main/CoderRootCommit.js
@@ -155,7 +155,7 @@ class CoderRootCommit extends Component{
{item.message}
-
+
{item.name}
- {data && data.user_permission && type !== 2 && }
- {data && data.user_permission && type !== 2 && {deleteRelease(item.version_id)}}>}
+ {data && data.user_admin_permission && type !== 2 && }
+ {data && data.user_admin_permission && type !== 2 && {deleteRelease(item.version_id)}}>}