Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
charts
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
drupal.org
charts
Commits
e2c208ac
Commit
e2c208ac
authored
7 years ago
by
andileco
Browse files
Options
Downloads
Patches
Plain Diff
incorporate patch from 2864456 and remove unused reference to a theme file
parent
0d3873f1
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
includes/charts.pages.inc
+1
-1
1 addition, 1 deletion
includes/charts.pages.inc
src/Plugin/views/style/ChartsPluginStyleChart.php
+0
-1
0 additions, 1 deletion
src/Plugin/views/style/ChartsPluginStyleChart.php
with
1 addition
and
2 deletions
includes/charts.pages.inc
+
1
−
1
View file @
e2c208ac
...
@@ -218,7 +218,7 @@ function charts_cast_element_integer_values(&$element) {
...
@@ -218,7 +218,7 @@ function charts_cast_element_integer_values(&$element) {
function
charts_settings_form
(
$form
,
$defaults
=
array
(),
$field_options
=
array
(),
$parents
=
array
())
{
function
charts_settings_form
(
$form
,
$defaults
=
array
(),
$field_options
=
array
(),
$parents
=
array
())
{
// Ensure all defaults are set.
// Ensure all defaults are set.
$options
=
array_merge
(
charts_default_settings
(),
$defaults
);
$options
=
array_merge
(
charts_default_settings
(),
$defaults
);
$form
[
'#attached'
][
'library'
][]
=
array
(
'
charts
'
,
'
charts.admin
'
)
;
$form
[
'#attached'
][
'library'
][]
=
"
charts
/
charts.admin
"
;
// Get a list of available chart libraries.
// Get a list of available chart libraries.
$charts_info
=
charts_info
();
$charts_info
=
charts_info
();
...
...
This diff is collapsed.
Click to expand it.
src/Plugin/views/style/ChartsPluginStyleChart.php
+
0
−
1
View file @
e2c208ac
...
@@ -6,7 +6,6 @@ use Drupal\core\form\FormStateInterface;
...
@@ -6,7 +6,6 @@ use Drupal\core\form\FormStateInterface;
use
Drupal\Core\Render\Element
;
use
Drupal\Core\Render\Element
;
use
Drupal\views\Plugin\views\style\StylePluginBase
;
use
Drupal\views\Plugin\views\style\StylePluginBase
;
\Drupal
::
moduleHandler
()
->
loadInclude
(
'charts'
,
'inc'
,
'charts.theme'
);
\Drupal
::
moduleHandler
()
->
loadInclude
(
'charts'
,
'inc'
,
'includes/charts.pages'
);
\Drupal
::
moduleHandler
()
->
loadInclude
(
'charts'
,
'inc'
,
'includes/charts.pages'
);
/**
/**
...
...
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