Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
chris
repanier
Commits
fa90c853
Commit
fa90c853
authored
Jan 27, 2017
by
Patrick
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Security an cms_toolbar alignment
parent
cf25b6c8
Changes
12
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
100 additions
and
85 deletions
+100
-85
repanier/admin/bankaccount.py
repanier/admin/bankaccount.py
+1
-3
repanier/admin/box.py
repanier/admin/box.py
+4
-10
repanier/admin/customer.py
repanier/admin/customer.py
+5
-2
repanier/admin/offeritem.py
repanier/admin/offeritem.py
+5
-2
repanier/admin/permanence_done.py
repanier/admin/permanence_done.py
+2
-1
repanier/admin/permanence_in_preparation.py
repanier/admin/permanence_in_preparation.py
+1
-4
repanier/admin/producer.py
repanier/admin/producer.py
+6
-2
repanier/admin/product.py
repanier/admin/product.py
+6
-2
repanier/admin/rule_of_3_per_customer.py
repanier/admin/rule_of_3_per_customer.py
+4
-1
repanier/admin/rule_of_3_per_product.py
repanier/admin/rule_of_3_per_product.py
+4
-2
repanier/admin/staff.py
repanier/admin/staff.py
+1
-4
repanier/cms_toolbar.py
repanier/cms_toolbar.py
+61
-52
No files found.
repanier/admin/bankaccount.py
View file @
fa90c853
...
...
@@ -276,9 +276,7 @@ class BankAccountAdmin(ImportExportMixin, admin.ModelAdmin):
return
False
def
has_change_permission
(
self
,
request
,
bank_account
=
None
):
if
request
.
user
.
groups
.
filter
(
name__in
=
[
COORDINATION_GROUP
,
INVOICE_GROUP
]).
exists
()
or
request
.
user
.
is_superuser
:
return
True
return
False
return
self
.
has_add_permission
(
request
)
def
get_readonly_fields
(
self
,
request
,
obj
=
None
):
readonly_fields
=
[
...
...
repanier/admin/box.py
View file @
fa90c853
...
...
@@ -168,23 +168,17 @@ class BoxAdmin(TranslatableAdmin):
'duplicate_box'
]
def
has_delete_permission
(
self
,
request
,
obj
=
None
):
def
has_delete_permission
(
self
,
request
,
box
=
None
):
if
request
.
user
.
groups
.
filter
(
name__in
=
[
ORDER_GROUP
,
INVOICE_GROUP
,
COORDINATION_GROUP
]).
exists
()
or
request
.
user
.
is_superuser
:
return
True
return
False
def
has_add_permission
(
self
,
request
):
if
request
.
user
.
groups
.
filter
(
name__in
=
[
ORDER_GROUP
,
INVOICE_GROUP
,
COORDINATION_GROUP
]).
exists
()
or
request
.
user
.
is_superuser
:
return
True
return
False
return
self
.
has_delete_permission
(
request
)
def
has_change_permission
(
self
,
request
,
obj
=
None
):
if
request
.
user
.
groups
.
filter
(
name__in
=
[
ORDER_GROUP
,
INVOICE_GROUP
,
COORDINATION_GROUP
]).
exists
()
or
request
.
user
.
is_superuser
:
return
True
return
False
def
has_change_permission
(
self
,
request
,
box
=
None
):
return
self
.
has_delete_permission
(
request
,
box
)
def
flip_flop_select_for_offer_status
(
self
,
request
,
queryset
):
task_box
.
flip_flop_is_into_offer
(
queryset
)
...
...
repanier/admin/customer.py
View file @
fa90c853
...
...
@@ -252,10 +252,13 @@ class CustomerWithUserDataAdmin(ImportExportMixin, admin.ModelAdmin):
return
False
def
has_add_permission
(
self
,
request
):
return
True
if
request
.
user
.
groups
.
filter
(
name__in
=
[
ORDER_GROUP
,
INVOICE_GROUP
,
COORDINATION_GROUP
]).
exists
()
or
request
.
user
.
is_superuser
:
return
True
return
False
def
has_change_permission
(
self
,
request
,
obj
=
None
):
return
True
return
self
.
has_add_permission
(
request
)
def
get_email
(
self
,
customer
):
if
customer
.
user
is
not
None
:
...
...
repanier/admin/offeritem.py
View file @
fa90c853
...
...
@@ -9,7 +9,7 @@ from django.utils.translation import ugettext_lazy as _
from
repanier.admin.admin_filter
import
PurchaseFilterByProducerForThisPermanence
,
\
ProductFilterByDepartmentForThisProducer
,
OfferItemFilter
from
repanier.const
import
PERMANENCE_CLOSED
,
PERMANENCE_OPENED
from
repanier.const
import
PERMANENCE_CLOSED
,
PERMANENCE_OPENED
,
ORDER_GROUP
,
INVOICE_GROUP
,
COORDINATION_GROUP
from
repanier.models
import
Permanence
,
Product
,
LUT_DepartmentForCustomer
,
Producer
from
repanier.tools
import
sint
,
update_offer_item
...
...
@@ -142,7 +142,10 @@ class OfferItemClosedAdmin(admin.ModelAdmin):
return
False
def
has_change_permission
(
self
,
request
,
obj
=
None
):
return
True
if
request
.
user
.
groups
.
filter
(
name__in
=
[
ORDER_GROUP
,
INVOICE_GROUP
,
COORDINATION_GROUP
]).
exists
()
or
request
.
user
.
is_superuser
:
return
True
return
False
def
get_actions
(
self
,
request
):
actions
=
super
(
OfferItemClosedAdmin
,
self
).
get_actions
(
request
)
...
...
repanier/admin/permanence_done.py
View file @
fa90c853
...
...
@@ -74,7 +74,8 @@ class PermanenceDoneAdmin(TranslatableAdmin):
return
False
def
has_change_permission
(
self
,
request
,
obj
=
None
):
if
request
.
user
.
groups
.
filter
(
name__in
=
[
ORDER_GROUP
,
INVOICE_GROUP
,
COORDINATION_GROUP
]).
exists
()
or
request
.
user
.
is_superuser
:
if
request
.
user
.
groups
.
filter
(
name__in
=
[
ORDER_GROUP
,
INVOICE_GROUP
,
COORDINATION_GROUP
]).
exists
()
or
request
.
user
.
is_superuser
:
return
True
return
False
...
...
repanier/admin/permanence_in_preparation.py
View file @
fa90c853
...
...
@@ -164,10 +164,7 @@ class PermanenceInPreparationAdmin(TranslatableAdmin):
return
self
.
has_delete_permission
(
request
)
def
has_change_permission
(
self
,
request
,
obj
=
None
):
if
request
.
user
.
groups
.
filter
(
name__in
=
[
ORDER_GROUP
,
INVOICE_GROUP
,
COORDINATION_GROUP
]).
exists
()
or
request
.
user
.
is_superuser
:
return
True
return
False
return
self
.
has_delete_permission
(
request
,
obj
)
def
get_fields
(
self
,
request
,
permanence
=
None
):
fields
=
[
...
...
repanier/admin/producer.py
View file @
fa90c853
...
...
@@ -228,10 +228,14 @@ class ProducerAdmin(ImportExportMixin, admin.ModelAdmin):
return
False
def
has_add_permission
(
self
,
request
):
return
True
if
request
.
user
.
groups
.
filter
(
name__in
=
[
ORDER_GROUP
,
INVOICE_GROUP
,
COORDINATION_GROUP
,
CONTRIBUTOR_GROUP
]).
exists
()
or
request
.
user
.
is_superuser
:
return
True
return
False
def
has_change_permission
(
self
,
request
,
obj
=
None
):
return
True
return
self
.
has_add_permission
(
request
)
def
get_urls
(
self
):
urls
=
super
(
ProducerAdmin
,
self
).
get_urls
()
...
...
repanier/admin/product.py
View file @
fa90c853
...
...
@@ -308,10 +308,14 @@ class ProductAdmin(ImportExportMixin, TranslatableAdmin):
return
False
def
has_add_permission
(
self
,
request
):
return
True
if
request
.
user
.
groups
.
filter
(
name__in
=
[
ORDER_GROUP
,
INVOICE_GROUP
,
COORDINATION_GROUP
,
CONTRIBUTOR_GROUP
]).
exists
()
or
request
.
user
.
is_superuser
:
return
True
return
False
def
has_change_permission
(
self
,
request
,
obj
=
None
):
return
True
return
self
.
has_add_permission
(
request
)
def
flip_flop_select_for_offer_status
(
self
,
request
,
queryset
):
task_product
.
flip_flop_is_into_offer
(
queryset
)
...
...
repanier/admin/rule_of_3_per_customer.py
View file @
fa90c853
...
...
@@ -153,7 +153,10 @@ class CustomerSendAdmin(admin.ModelAdmin):
return
False
def
has_change_permission
(
self
,
request
,
obj
=
None
):
return
True
if
request
.
user
.
groups
.
filter
(
name__in
=
[
ORDER_GROUP
,
INVOICE_GROUP
,
COORDINATION_GROUP
]).
exists
()
or
request
.
user
.
is_superuser
:
return
True
return
False
def
get_actions
(
self
,
request
):
actions
=
super
(
CustomerSendAdmin
,
self
).
get_actions
(
request
)
...
...
repanier/admin/rule_of_3_per_product.py
View file @
fa90c853
...
...
@@ -115,7 +115,6 @@ class OfferItemSendDataForm(forms.ModelForm):
previous_unit_deposit
=
FormMoneyField
(
max_digits
=
8
,
decimal_places
=
2
,
required
=
False
,
initial
=
REPANIER_MONEY_ZERO
)
def
__init__
(
self
,
*
args
,
**
kwargs
):
getcontext
().
rounding
=
ROUND_HALF_UP
super
(
OfferItemSendDataForm
,
self
).
__init__
(
*
args
,
**
kwargs
)
...
...
@@ -272,7 +271,10 @@ class OfferItemSendAdmin(admin.ModelAdmin):
return
False
def
has_change_permission
(
self
,
request
,
obj
=
None
):
return
True
if
request
.
user
.
groups
.
filter
(
name__in
=
[
ORDER_GROUP
,
INVOICE_GROUP
,
COORDINATION_GROUP
]).
exists
()
or
request
.
user
.
is_superuser
:
return
True
return
False
def
get_actions
(
self
,
request
):
actions
=
super
(
OfferItemSendAdmin
,
self
).
get_actions
(
request
)
...
...
repanier/admin/staff.py
View file @
fa90c853
...
...
@@ -134,10 +134,7 @@ class StaffWithUserDataAdmin(TranslatableAdmin):
return
False
def
has_change_permission
(
self
,
request
,
staff
=
None
):
if
request
.
user
.
groups
.
filter
(
name__in
=
[
ORDER_GROUP
,
INVOICE_GROUP
,
COORDINATION_GROUP
]).
exists
()
or
request
.
user
.
is_superuser
:
return
True
return
False
return
self
.
has_add_permission
(
request
)
def
get_form
(
self
,
request
,
obj
=
None
,
**
kwargs
):
form
=
super
(
StaffWithUserDataAdmin
,
self
).
get_form
(
request
,
obj
,
**
kwargs
)
...
...
repanier/cms_toolbar.py
View file @
fa90c853
...
...
@@ -19,66 +19,75 @@ class RepanierToolbar(CMSToolbar):
from
apps
import
REPANIER_SETTINGS_PERMANENCES_NAME
,
REPANIER_SETTINGS_INVOICE
if
settings
.
DJANGO_SETTINGS_DEMO
:
self
.
toolbar
.
get_or_create_menu
(
"demo-menu"
,
_
(
'Demo (%s)'
)
%
(
DEMO_EMAIL
,))
if
self
.
request
.
user
.
groups
.
filter
(
name__in
=
[
ORDER_GROUP
,
INVOICE_GROUP
,
COORDINATION_GROUP
]).
exists
()
or
self
.
request
.
user
.
is_superuser
:
display_all
=
True
elif
self
.
request
.
user
.
groups
.
filter
(
name
=
CONTRIBUTOR_GROUP
).
exists
():
display_all
=
False
else
:
return
admin_menu
=
self
.
toolbar
.
get_or_create_menu
(
ADMIN_MENU_IDENTIFIER
,
_
(
'Manage'
))
position
=
admin_menu
.
get_alphabetical_insert_position
(
_
(
'Parameters'
),
SubMenu
)
if
not
position
:
# TODO : Check this part of the code
position
=
0
admin_menu
.
add_break
(
'custom-break'
,
position
=
position
)
office_menu
=
admin_menu
.
get_or_create_menu
(
'parameter-menu'
,
_
(
'Parameters ...'
),
position
=
position
)
# add_sideframe_item
config
=
Configuration
.
objects
.
filter
(
id
=
DECIMAL_ONE
).
only
(
'id'
).
first
()
url
=
reverse
(
'admin:repanier_configuration_change'
,
args
=
(
config
.
id
,))
office_menu
.
add_sideframe_item
(
_
(
'Configuration'
),
url
=
url
)
url
=
reverse
(
'admin:repanier_staff_changelist'
)
office_menu
.
add_sideframe_item
(
_
(
'Staff Member List'
),
url
=
url
)
url
=
reverse
(
'admin:repanier_lut_permanencerole_changelist'
)
office_menu
.
add_sideframe_item
(
_
(
'Permanence Role List'
),
url
=
url
)
url
=
reverse
(
'admin:repanier_lut_productionmode_changelist'
)
office_menu
.
add_sideframe_item
(
_
(
'Production Mode List'
),
url
=
url
)
url
=
reverse
(
'admin:repanier_lut_deliverypoint_changelist'
)
office_menu
.
add_sideframe_item
(
_
(
'Delivery Point List'
),
url
=
url
)
url
=
reverse
(
'admin:repanier_lut_departmentforcustomer_changelist'
)
office_menu
.
add_sideframe_item
(
_
(
'Departement for Customer List'
),
url
=
url
)
# position = admin_menu.get_alphabetical_insert_position(
# _('Parameters'),
# SubMenu
# )
# if not position:
position
=
0
admin_menu
.
add_break
(
'custom-break'
,
position
=
position
)
if
display_all
:
office_menu
=
admin_menu
.
get_or_create_menu
(
'parameter-menu'
,
_
(
'Parameters ...'
),
position
=
position
)
# add_sideframe_item
config
=
Configuration
.
objects
.
filter
(
id
=
DECIMAL_ONE
).
only
(
'id'
).
first
()
url
=
reverse
(
'admin:repanier_configuration_change'
,
args
=
(
config
.
id
,))
office_menu
.
add_sideframe_item
(
_
(
'Configuration'
),
url
=
url
)
url
=
reverse
(
'admin:repanier_staff_changelist'
)
office_menu
.
add_sideframe_item
(
_
(
'Staff Member List'
),
url
=
url
)
url
=
reverse
(
'admin:repanier_lut_permanencerole_changelist'
)
office_menu
.
add_sideframe_item
(
_
(
'Permanence Role List'
),
url
=
url
)
url
=
reverse
(
'admin:repanier_lut_productionmode_changelist'
)
office_menu
.
add_sideframe_item
(
_
(
'Production Mode List'
),
url
=
url
)
url
=
reverse
(
'admin:repanier_lut_deliverypoint_changelist'
)
office_menu
.
add_sideframe_item
(
_
(
'Delivery Point List'
),
url
=
url
)
url
=
reverse
(
'admin:repanier_lut_departmentforcustomer_changelist'
)
office_menu
.
add_sideframe_item
(
_
(
'Departement for Customer List'
),
url
=
url
)
position
+=
1
position
+=
1
url
=
reverse
(
'admin:repanier_customer_changelist'
)
admin_menu
.
add_sideframe_item
(
_
(
'Customer List'
),
url
=
url
,
position
=
position
)
url
=
reverse
(
'admin:repanier_customer_changelist'
)
admin_menu
.
add_sideframe_item
(
_
(
'Customer List'
),
url
=
url
,
position
=
position
)
position
+=
1
position
+=
1
url
=
reverse
(
'admin:repanier_producer_changelist'
)
admin_menu
.
add_sideframe_item
(
_
(
'Producer List'
),
url
=
url
,
position
=
position
)
position
+=
1
url
=
"%s?is_into_offer__exact=1"
%
reverse
(
'admin:repanier_box_changelist'
)
admin_menu
.
add_sideframe_item
(
_
(
'Box List'
),
url
=
url
,
position
=
position
)
position
+=
1
url
=
reverse
(
'admin:repanier_permanenceinpreparation_changelist'
)
admin_menu
.
add_sideframe_item
(
_
(
"%(name)s in preparation list"
)
%
{
'name'
:
REPANIER_SETTINGS_PERMANENCES_NAME
},
url
=
url
,
position
=
position
)
if
REPANIER_SETTINGS_INVOICE
:
if
display_all
:
position
+=
1
url
=
reverse
(
'admin:repanier_permanencedone_changelist'
)
admin_menu
.
add_sideframe_item
(
_
(
"%(name)s done list"
)
%
{
'name'
:
REPANIER_SETTINGS_PERMANENCES_NAME
},
url
=
url
,
position
=
position
)
url
=
"%s?is_into_offer__exact=1"
%
reverse
(
'admin:repanier_box_changelist'
)
admin_menu
.
add_sideframe_item
(
_
(
'Box List'
),
url
=
url
,
position
=
position
)
position
+=
1
url
=
reverse
(
'admin:repanier_bankaccount_changelist'
)
admin_menu
.
add_sideframe_item
(
_
(
'Bank Account List'
),
url
=
url
,
position
=
position
)
else
:
position
+=
1
url
=
reverse
(
'admin:repanier_permanencedone_changelist'
)
url
=
reverse
(
'admin:repanier_permanenceinpreparation_changelist'
)
admin_menu
.
add_sideframe_item
(
_
(
"%(name)s
archived
list"
)
%
{
'name'
:
REPANIER_SETTINGS_PERMANENCES_NAME
},
_
(
"%(name)s
in preparation
list"
)
%
{
'name'
:
REPANIER_SETTINGS_PERMANENCES_NAME
},
url
=
url
,
position
=
position
)
if
REPANIER_SETTINGS_INVOICE
:
position
+=
1
url
=
reverse
(
'admin:repanier_permanencedone_changelist'
)
admin_menu
.
add_sideframe_item
(
_
(
"%(name)s done list"
)
%
{
'name'
:
REPANIER_SETTINGS_PERMANENCES_NAME
},
url
=
url
,
position
=
position
)
position
+=
1
url
=
reverse
(
'admin:repanier_bankaccount_changelist'
)
admin_menu
.
add_sideframe_item
(
_
(
'Bank Account List'
),
url
=
url
,
position
=
position
)
else
:
position
+=
1
url
=
reverse
(
'admin:repanier_permanencedone_changelist'
)
admin_menu
.
add_sideframe_item
(
_
(
"%(name)s archived list"
)
%
{
'name'
:
REPANIER_SETTINGS_PERMANENCES_NAME
},
url
=
url
,
position
=
position
)
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