Toggle navigation
Toggle navigation
This project
Loading...
Sign in
ops
/
monitor-ui
·
Commits
Go to a project
GitLab
Go to group
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
0
Merge Requests
0
Members
Labels
Wiki
Forks
Network
Create a new issue
Download as
Email Patches
Plain Diff
Browse Files
Authored by
qinchao
7 years ago
Commit
d0811eaca8286bce70c10e3c0742152040d78000
1 parent
29a6602d
docker发布不校验分支
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
22 deletions
monitor-ui-ctrl/src/main/java/com/ui/ctrl/ProjectBuildCtrl.java
monitor-ui-web/src/main/webapp/jsp/project/docker_project.jsp
monitor-ui-ctrl/src/main/java/com/ui/ctrl/ProjectBuildCtrl.java
View file @
d0811ea
...
...
@@ -143,7 +143,7 @@ public class ProjectBuildCtrl {
}
log
.
info
(
"check environment {} projects {} branch {}"
,
environment
,
projects
,
branch
);
if
(!(
"master"
.
equals
(
branch
)
||
"test"
.
equals
(
branch
)
||
"dev"
.
equals
(
branch
)
||
"qcloudOnly"
.
equals
(
branch
)
||
"feature/docker"
.
equals
(
branch
)
))
{
if
(!(
"master"
.
equals
(
branch
)
||
"test"
.
equals
(
branch
)
||
"dev"
.
equals
(
branch
)
))
{
map
.
clear
();
map
.
put
(
"projects"
,
projects
);
map
.
put
(
"branch"
,
branch
);
...
...
monitor-ui-web/src/main/webapp/jsp/project/docker_project.jsp
View file @
d0811ea
...
...
@@ -313,27 +313,13 @@
return
;
}
$
.
ajax
({
url
:
contextPath
+
'project/check?projects='
+
projectNames
+
'&branch='
+
branch
+
'&environment='
+
environment
+
'&workid='
+
workid
,
type
:
'POST'
,
success
:
function
(
data
)
{
if
(
data
!=
"1"
)
{
alert
(
data
);
return
;
}
else
{
$
(
"input[name='operate_name']"
).
val
(
operate
);
$
(
"input[name='project_id']"
).
val
(
projects
);
$
(
"input[name='project_name']"
).
val
(
projectNames
);
$
(
"input[name='environment_name']"
).
val
(
environment
);
$
(
"input[name='branch_name']"
).
val
(
branch
);
$
(
"input[name='workid_name']"
).
val
(
workid
);
$
(
'#confirmSubmitDivId'
).
modal
(
'show'
);
}
},
error
:
function
(
e
)
{
alert
(
"从后台获取数据出错"
);
}
});
$
(
"input[name='operate_name']"
).
val
(
operate
);
$
(
"input[name='project_id']"
).
val
(
projects
);
$
(
"input[name='project_name']"
).
val
(
projectNames
);
$
(
"input[name='environment_name']"
).
val
(
environment
);
$
(
"input[name='branch_name']"
).
val
(
branch
);
$
(
"input[name='workid_name']"
).
val
(
workid
);
$
(
'#confirmSubmitDivId'
).
modal
(
'show'
);
}
}
...
...
Please
register
or
login
to post a comment