Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
hshassets
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
django
hshassets
Commits
86d38a57
Commit
86d38a57
authored
6 years ago
by
Elke Kreim
Browse files
Options
Downloads
Patches
Plain Diff
Fix buildassets for project without assets directory
parent
996b6739
Branches
Branches containing commit
Tags
v2.1.1
Tags containing commit
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
hshassets/utils.py
+3
-2
3 additions, 2 deletions
hshassets/utils.py
with
3 additions
and
2 deletions
hshassets/utils.py
+
3
−
2
View file @
86d38a57
...
@@ -253,7 +253,7 @@ def build_css_from_scss(app_name):
...
@@ -253,7 +253,7 @@ def build_css_from_scss(app_name):
sass_source
=
get_init_scss_path
(
app_name
)
sass_source
=
get_init_scss_path
(
app_name
)
# if no path to a sass file exists in projekt take the default sass file of 'hshassets'
# if no path to a sass file exists in projekt take the default sass file of 'hshassets'
if
not
os
.
path
.
isfile
(
sass_source
)
and
app_name
is
get_projectname
():
if
not
os
.
path
.
isfile
(
sass_source
)
and
app_name
==
get_projectname
():
sass_source
=
get_default_scss_path
()
sass_source
=
get_default_scss_path
()
if
os
.
path
.
isfile
(
sass_source
):
if
os
.
path
.
isfile
(
sass_source
):
...
@@ -435,8 +435,9 @@ def build_assets():
...
@@ -435,8 +435,9 @@ def build_assets():
# PROJECT
# PROJECT
project_name
=
get_projectname
()
project_name
=
get_projectname
()
apps
=
get_installed_apps_with_asset_directory
(
include_project
=
True
)
apps
=
get_installed_apps_with_asset_directory
(
include_project
=
True
)
if
project_name
not
in
apps
:
if
project_name
not
in
apps
:
apps
.
append
(
project_name
)
build_app_css_from_scss
(
project_name
)
for
app_name
in
apps
:
for
app_name
in
apps
:
copy_assets_dirs_to_static
(
app_name
)
copy_assets_dirs_to_static
(
app_name
)
...
...
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