Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
a68f1fdd
Commit
a68f1fdd
authored
Oct 05, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix form not re-enabling thanks to jQuery
Stop issue being dragged if it doesn't have an ID
parent
b9ede4f1
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
5 deletions
+10
-5
app/assets/javascripts/boards/components/board_list.js.es6
app/assets/javascripts/boards/components/board_list.js.es6
+1
-1
app/assets/javascripts/boards/components/board_new_issue.js.es6
...sets/javascripts/boards/components/board_new_issue.js.es6
+5
-1
app/assets/javascripts/boards/models/list.js.es6
app/assets/javascripts/boards/models/list.js.es6
+1
-1
app/views/projects/boards/components/_board.html.haml
app/views/projects/boards/components/_board.html.haml
+2
-1
app/views/projects/boards/components/_card.html.haml
app/views/projects/boards/components/_card.html.haml
+1
-1
No files found.
app/assets/javascripts/boards/components/board_list.js.es6
View file @
a68f1fdd
...
@@ -76,7 +76,7 @@
...
@@ -76,7 +76,7 @@
group: 'issues',
group: 'issues',
sort: false,
sort: false,
disabled: this.disabled,
disabled: this.disabled,
filter: '.board-list-count, .
board-new-issue-form
',
filter: '.board-list-count, .
is-disabled
',
onStart: (e) => {
onStart: (e) => {
const card = this.$refs.issue[e.oldIndex];
const card = this.$refs.issue[e.oldIndex];
...
...
app/assets/javascripts/boards/components/board_new_issue.js.es6
View file @
a68f1fdd
...
@@ -25,7 +25,11 @@
...
@@ -25,7 +25,11 @@
labels
labels
});
});
this.list.newIssue(issue);
this.list.newIssue(issue)
.then(() => {
// Need this because our jQuery very kindly disables buttons on ALL form submissions
$(this.$els.submitButton).enable();
});
this.cancel();
this.cancel();
},
},
...
...
app/assets/javascripts/boards/models/list.js.es6
View file @
a68f1fdd
...
@@ -91,7 +91,7 @@ class List {
...
@@ -91,7 +91,7 @@ class List {
this.addIssue(issue);
this.addIssue(issue);
this.issuesSize++;
this.issuesSize++;
gl.boardService.newIssue(this.id, issue)
return
gl.boardService.newIssue(this.id, issue)
.then((resp) => {
.then((resp) => {
const data = resp.json();
const data = resp.json();
issue.id = data.iid;
issue.id = data.iid;
...
...
app/views/projects/boards/components/_board.html.haml
View file @
a68f1fdd
...
@@ -54,7 +54,8 @@
...
@@ -54,7 +54,8 @@
":id"
=>
"list.id + '-title'"
}
":id"
=>
"list.id + '-title'"
}
.clearfix.prepend-top-10
.clearfix.prepend-top-10
%button
.btn.btn-success.pull-left
{
type:
"submit"
,
%button
.btn.btn-success.pull-left
{
type:
"submit"
,
":disabled"
=>
"title === ''"
}
":disabled"
=>
"title === ''"
,
"v-el:submit-button"
=>
true
}
Submit issue
Submit issue
%button
.btn.btn-default.pull-right
{
type:
"button"
,
%button
.btn.btn-default.pull-right
{
type:
"button"
,
"@click"
=>
"cancel"
}
"@click"
=>
"cancel"
}
...
...
app/views/projects/boards/components/_card.html.haml
View file @
a68f1fdd
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
":issue-link-base"
=>
"issueLinkBase"
,
":issue-link-base"
=>
"issueLinkBase"
,
":disabled"
=>
"disabled"
,
":disabled"
=>
"disabled"
,
"track-by"
=>
"id"
}
"track-by"
=>
"id"
}
%li
.card
{
":class"
=>
"{ 'user-can-drag': !disabled }"
,
%li
.card
{
":class"
=>
"{ 'user-can-drag': !disabled
&& issue.id, 'is-disabled': disabled || !issue.id
}"
,
":index"
=>
"index"
}
":index"
=>
"index"
}
%h4
.card-title
%h4
.card-title
=
icon
(
"eye-slash"
,
class:
"confidential-icon"
,
"v-if"
=>
"issue.confidential"
)
=
icon
(
"eye-slash"
,
class:
"confidential-icon"
,
"v-if"
=>
"issue.confidential"
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment