Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
R
repanier
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
chris
repanier
Commits
2788334b
Commit
2788334b
authored
Jan 15, 2017
by
Patrick
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Set HTMLField configuration to CKEDITOR_SETTINGS_MODEL2
parent
f2f22adf
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
13 additions
and
10 deletions
+13
-10
repanier/models/lut.py
repanier/models/lut.py
+4
-4
repanier/models/offeritem.py
repanier/models/offeritem.py
+3
-3
repanier/models/permanence.py
repanier/models/permanence.py
+3
-1
repanier/models/product.py
repanier/models/product.py
+1
-1
repanier/models/staff.py
repanier/models/staff.py
+2
-1
No files found.
repanier/models/lut.py
View file @
2788334b
...
...
@@ -32,7 +32,7 @@ class LUT_ProductionMode(MPTTModel, TranslatableModel):
parent
=
TreeForeignKey
(
'self'
,
null
=
True
,
blank
=
True
,
related_name
=
'children'
)
translations
=
TranslatedFields
(
short_name
=
models
.
CharField
(
_
(
"short_name"
),
max_length
=
50
,
db_index
=
True
,
unique
=
True
,
default
=
EMPTY_STRING
),
description
=
HTMLField
(
_
(
"description"
),
blank
=
True
,
default
=
EMPTY_STRING
),
description
=
HTMLField
(
_
(
"description"
),
configuration
=
'CKEDITOR_SETTINGS_MODEL2'
,
blank
=
True
,
default
=
EMPTY_STRING
),
)
picture2
=
AjaxPictureField
(
verbose_name
=
_
(
"picture"
),
...
...
@@ -63,7 +63,7 @@ class LUT_DeliveryPoint(MPTTModel, TranslatableModel):
parent
=
TreeForeignKey
(
'self'
,
null
=
True
,
blank
=
True
,
related_name
=
'children'
)
translations
=
TranslatedFields
(
short_name
=
models
.
CharField
(
_
(
"short_name"
),
max_length
=
50
,
db_index
=
True
,
unique
=
True
,
default
=
EMPTY_STRING
),
description
=
HTMLField
(
_
(
"description"
),
blank
=
True
,
default
=
EMPTY_STRING
),
description
=
HTMLField
(
_
(
"description"
),
configuration
=
'CKEDITOR_SETTINGS_MODEL2'
,
blank
=
True
,
default
=
EMPTY_STRING
),
)
is_active
=
models
.
BooleanField
(
_
(
"is_active"
),
default
=
True
)
customer_responsible
=
models
.
ForeignKey
(
...
...
@@ -111,7 +111,7 @@ class LUT_DepartmentForCustomer(MPTTModel, TranslatableModel):
parent
=
TreeForeignKey
(
'self'
,
null
=
True
,
blank
=
True
,
related_name
=
'children'
)
translations
=
TranslatedFields
(
short_name
=
models
.
CharField
(
_
(
"short_name"
),
max_length
=
50
,
db_index
=
True
,
unique
=
True
,
default
=
EMPTY_STRING
),
description
=
HTMLField
(
_
(
"description"
),
blank
=
True
,
default
=
EMPTY_STRING
),
description
=
HTMLField
(
_
(
"description"
),
configuration
=
'CKEDITOR_SETTINGS_MODEL2'
,
blank
=
True
,
default
=
EMPTY_STRING
),
)
is_active
=
models
.
BooleanField
(
_
(
"is_active"
),
default
=
True
)
objects
=
LUT_ProductionModeManager
()
...
...
@@ -137,7 +137,7 @@ class LUT_PermanenceRole(MPTTModel, TranslatableModel):
parent
=
TreeForeignKey
(
'self'
,
null
=
True
,
blank
=
True
,
related_name
=
'children'
)
translations
=
TranslatedFields
(
short_name
=
models
.
CharField
(
_
(
"short_name"
),
max_length
=
50
,
db_index
=
True
,
unique
=
True
,
default
=
EMPTY_STRING
),
description
=
HTMLField
(
_
(
"description"
),
blank
=
True
,
default
=
EMPTY_STRING
),
description
=
HTMLField
(
_
(
"description"
),
configuration
=
'CKEDITOR_SETTINGS_MODEL2'
,
blank
=
True
,
default
=
EMPTY_STRING
),
)
is_counted_as_participation
=
models
.
BooleanField
(
_
(
"is_counted_as_participation"
),
default
=
True
)
...
...
repanier/models/offeritem.py
View file @
2788334b
...
...
@@ -29,9 +29,9 @@ class OfferItem(TranslatableModel):
translations
=
TranslatedFields
(
long_name
=
models
.
CharField
(
_
(
"long_name"
),
max_length
=
100
,
default
=
EMPTY_STRING
,
blank
=
True
,
null
=
True
),
cache_part_a
=
HTMLField
(
default
=
EMPTY_STRING
,
blank
=
True
),
cache_part_b
=
HTMLField
(
default
=
EMPTY_STRING
,
blank
=
True
),
cache_part_e
=
HTMLField
(
default
=
EMPTY_STRING
,
blank
=
True
),
cache_part_a
=
HTMLField
(
configuration
=
'CKEDITOR_SETTINGS_MODEL2'
,
default
=
EMPTY_STRING
,
blank
=
True
),
cache_part_b
=
HTMLField
(
configuration
=
'CKEDITOR_SETTINGS_MODEL2'
,
default
=
EMPTY_STRING
,
blank
=
True
),
cache_part_e
=
HTMLField
(
configuration
=
'CKEDITOR_SETTINGS_MODEL2'
,
default
=
EMPTY_STRING
,
blank
=
True
),
order_sort_order
=
models
.
IntegerField
(
_
(
"customer sort order for optimization"
),
default
=
0
,
db_index
=
True
),
...
...
repanier/models/permanence.py
View file @
2788334b
...
...
@@ -34,15 +34,17 @@ class Permanence(TranslatableModel):
translations
=
TranslatedFields
(
short_name
=
models
.
CharField
(
_
(
"offer name"
),
max_length
=
50
,
blank
=
True
),
offer_description
=
HTMLField
(
_
(
"offer_description"
),
configuration
=
'CKEDITOR_SETTINGS_MODEL2'
,
help_text
=
_
(
"This message is send by mail to all customers when opening the order or on top "
),
blank
=
True
,
default
=
EMPTY_STRING
),
invoice_description
=
HTMLField
(
_
(
"invoice_description"
),
configuration
=
'CKEDITOR_SETTINGS_MODEL2'
,
help_text
=
_
(
'This message is send by mail to all customers having bought something when closing the permanence.'
),
blank
=
True
,
default
=
EMPTY_STRING
),
cache_part_d
=
HTMLField
(
blank
=
True
,
default
=
EMPTY_STRING
)
cache_part_d
=
HTMLField
(
configuration
=
'CKEDITOR_SETTINGS_MODEL2'
,
blank
=
True
,
default
=
EMPTY_STRING
)
)
status
=
models
.
CharField
(
...
...
repanier/models/product.py
View file @
2788334b
...
...
@@ -308,7 +308,7 @@ def product_post_save(sender, **kwargs):
class
Product_Translation
(
TranslatedFieldsModel
):
master
=
models
.
ForeignKey
(
'Product'
,
related_name
=
'translations'
,
null
=
True
)
long_name
=
models
.
CharField
(
_
(
"long_name"
),
max_length
=
100
)
offer_description
=
HTMLField
(
_
(
"offer_description"
),
blank
=
True
)
offer_description
=
HTMLField
(
_
(
"offer_description"
),
configuration
=
'CKEDITOR_SETTINGS_MODEL2'
,
blank
=
True
)
class
Meta
:
unique_together
=
(
'language_code'
,
'master'
)
...
...
repanier/models/staff.py
View file @
2788334b
...
...
@@ -28,7 +28,8 @@ class Staff(TranslatableModel):
default
=
DECIMAL_ZERO
,
max_digits
=
2
,
decimal_places
=
0
)
translations
=
TranslatedFields
(
long_name
=
models
.
CharField
(
_
(
"long_name"
),
max_length
=
100
,
db_index
=
True
,
null
=
True
,
default
=
EMPTY_STRING
),
function_description
=
HTMLField
(
_
(
"function_description"
),
blank
=
True
,
default
=
EMPTY_STRING
),
function_description
=
HTMLField
(
_
(
"function_description"
),
configuration
=
'CKEDITOR_SETTINGS_MODEL2'
,
blank
=
True
,
default
=
EMPTY_STRING
),
)
is_reply_to_order_email
=
models
.
BooleanField
(
_
(
"is_reply_to_order_email"
),
default
=
False
)
...
...
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