Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
Metabase
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Engineering Digital Service
Metabase
Commits
0d012d28
Commit
0d012d28
authored
9 years ago
by
Tom Robinson
Browse files
Options
Downloads
Patches
Plain Diff
Use dashboard_count in card editing header, fix syntax error in DeleteQuestionModal
parent
139a8d33
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
resources/frontend_client/app/components/DeleteQuestionModal.react.js
+1
-1
1 addition, 1 deletion
...ontend_client/app/components/DeleteQuestionModal.react.js
resources/frontend_client/app/query_builder/header.react.js
+11
-2
11 additions, 2 deletions
resources/frontend_client/app/query_builder/header.react.js
with
12 additions
and
3 deletions
resources/frontend_client/app/components/DeleteQuestionModal.react.js
+
1
−
1
View file @
0d012d28
...
...
@@ -53,7 +53,7 @@ export default React.createClass({
>
<
div
className
=
"
Form-inputs mb4
"
>
<
p
>
Are
you
sure
you
want
to
do
this
?
<
/p
>
<
p
>
This
question
will
be
deleted
from
Metabase
,
and
will
also
be
removed
from
:
/p
>
<
p
>
This
question
will
be
deleted
from
Metabase
,
and
will
also
be
removed
from
:
<
/p
>
<
ul
>
<
li
>
{
dashboardCount
}
<
/li
>
<
li
>
0
email
reports
<
/li
>
...
...
This diff is collapsed.
Click to expand it.
resources/frontend_client/app/query_builder/header.react.js
+
11
−
2
View file @
0d012d28
...
...
@@ -13,7 +13,9 @@ import QueryModeToggle from './query_mode_toggle.react';
import
QuestionSavedModal
from
'
../components/QuestionSavedModal.react
'
;
import
SaveQuestionModal
from
'
../components/SaveQuestionModal.react
'
;
var
cx
=
React
.
addons
.
classSet
;
import
inflection
from
"
inflection
"
;
import
cx
from
"
classnames
"
;
var
ReactCSSTransitionGroup
=
React
.
addons
.
CSSTransitionGroup
;
export
default
React
.
createClass
({
...
...
@@ -132,10 +134,17 @@ export default React.createClass({
/>
);
}
var
subtitleText
;
if
(
this
.
props
.
card
.
dashboard_count
>
0
)
{
subtitleText
=
"
Changes will be reflected in
"
+
this
.
props
.
card
.
dashboard_count
+
"
"
+
inflection
.
inflect
(
"
dashboard
"
,
this
.
props
.
card
.
dashboard_count
)
+
"
and can be reverted.
"
;
}
else
{
subtitleText
=
"
Changes can be reverted.
"
}
return
(
<
div
className
=
"
EditHeader p1 px3 flex align-center
"
>
<
span
className
=
"
EditHeader-title
"
>
You
are
editing
a
saved
question
.
<
/span
>
<
span
className
=
"
EditHeader-subtitle mx1
"
>
Changes
will
be
reflected
in
1
dashboard
and
can
be
reverted
.
<
/span
>
<
span
className
=
"
EditHeader-subtitle mx1
"
>
{
subtitleText
}
<
/span
>
<
span
className
=
"
flex-align-right
"
>
{
updateButton
}
{
discardButton
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment