Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Sith
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
59
Issues
59
List
Boards
Labels
Service Desk
Milestones
Merge Requests
9
Merge Requests
9
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
AE
Sith
Commits
0660ea5e
Commit
0660ea5e
authored
Dec 29, 2016
by
Lo-J
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MAJ translations ; stock acces addition in user tool
parent
21c05cc7
Changes
7
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
35 additions
and
2917 deletions
+35
-2917
core/templates/core/user_tools.jinja
core/templates/core/user_tools.jinja
+11
-2
locale/fr/LC_MESSAGES/django.po
locale/fr/LC_MESSAGES/django.po
+0
-2908
stock/templates/stock/shopping_list_quantity.jinja
stock/templates/stock/shopping_list_quantity.jinja
+16
-0
stock/templates/stock/stock_item_list.jinja
stock/templates/stock/stock_item_list.jinja
+2
-1
stock/templates/stock/stock_list.jinja
stock/templates/stock/stock_list.jinja
+1
-1
stock/templates/stock/stock_shopping_list.jinja
stock/templates/stock/stock_shopping_list.jinja
+4
-4
stock/views.py
stock/views.py
+1
-1
No files found.
core/templates/core/user_tools.jinja
View file @
0660ea5e
...
...
@@ -34,9 +34,18 @@
{%
endif
%}
{%
for
b
in
settings.SITH_COUNTER_BARS
%}
{%
if
user.is_in_group
(
b
[
1
]
+
" admin"
)
%}
<li><a
href=
"
{{
url
(
'counter:details'
,
counter_id
=
b
[
0
])
}}
"
>
{{
b
[
1
]
}}
</a>
-
<li>
<a
href=
"
{{
url
(
'counter:details'
,
counter_id
=
b
[
0
])
}}
"
>
{{
b
[
1
]
}}
</a>
-
<a
href=
"
{{
url
(
'counter:admin'
,
counter_id
=
b
[
0
])
}}
"
>
{%
trans
%}
Edit
{%
endtrans
%}
</a>
-
<a
href=
"
{{
url
(
'counter:stats'
,
counter_id
=
b
[
0
])
}}
"
>
{%
trans
%}
Stats
{%
endtrans
%}
</a></li>
<a
href=
"
{{
url
(
'counter:stats'
,
counter_id
=
b
[
0
])
}}
"
>
{%
trans
%}
Stats
{%
endtrans
%}
</a>
-
{%
set
c
=
Counter.objects.
filter
(
id
=
b
[
0
])
.
first
()
%}
{%
if
c.stock
%}
<a
href=
"
{{
url
(
'stock:items_list'
,
stock_id
=
c.stock.id
)
}}
"
>
Stock
</a>
-
<a
href=
"
{{
url
(
'stock:shoppinglist_list'
,
stock_id
=
c.stock.id
)
}}
"
>
{%
trans
%}
Shopping lists
{%
endtrans
%}
</a>
{%
else
%}
<a
href=
"
{{
url
(
'stock:new'
,
counter_id
=
c.id
)
}}
"
>
{%
trans
%}
Create new stock
{%
endtrans
%}
</a>
{%
endif
%}
</li>
{%
endif
%}
{%
endfor
%}
</ul>
...
...
locale/fr/LC_MESSAGES/django.po
deleted
100644 → 0
View file @
21c05cc7
This diff is collapsed.
Click to expand it.
stock/templates/stock/shopping_list_quantity.jinja
0 → 100644
View file @
0660ea5e
{%
extends
"core/base.jinja"
%}
{%
block
title
%}
{%
trans
s
=
stock
%}{{
s
}}
's quantity to buy
{%
endtrans
%}
{%
endblock
%}
{%
block
content
%}
<h3>
{%
trans
s
=
stock
%}{{
s
}}
's quantity to buy
{%
endtrans
%}
</h3>
<div>
<form
method=
"post"
action=
""
class=
"inline"
style=
"display:inline"
>
{%
csrf_token
%}
{{
form.as_p
()
}}
<p><input
type=
"submit"
value=
"
{%
trans
%}
Create shopping list
{%
endtrans
%}
"
/></p>
</form>
</div>
{%
endblock
%}
stock/templates/stock/stock_item_list.jinja
View file @
0660ea5e
{%
extends
"core/base.jinja"
%}
{%
from
'core/macros.jinja'
import
user_profile_link
%}
{%
block
title
%}
{{
stock
}}
...
...
@@ -7,7 +8,7 @@
{%
block
content
%}
{%
if
current_tab
==
"stocks"
%}
<p><a
href=
"
{{
url
(
'stock:new_item'
,
stock_id
=
stock.id
)
}}
"
>
{%
trans
%}
New item
{%
endtrans
%}
</a></p>
<h5><a
href=
"
{{
url
(
'stock:shoppinglist_list'
,
stock_id
=
stock.id
)
}}
"
>
{%
trans
%}
Shopping list
{%
endtrans
%}
</a></h5>
<h5><a
href=
"
{{
url
(
'stock:shoppinglist_list'
,
stock_id
=
stock.id
)
}}
"
>
{%
trans
%}
Shopping list
s
{%
endtrans
%}
</a></h5>
{%
endif
%}
{%
if
stock
%}
<h3>
{{
stock
}}
</h3>
...
...
stock/templates/stock/stock_list.jinja
View file @
0660ea5e
...
...
@@ -11,7 +11,7 @@
{%
for
s
in
stock_list.order_by
(
'name'
)
%}
<li>
{%
if
user.can_edit
(
s
)
%}
<a
href=
"
{{
url
(
'stock:items_list'
,
stock_id
=
s.id
)
}}
"
>
{{
s
}}
</a>
<a
href=
"
{{
url
(
'stock:items_list'
,
stock_id
=
s.id
)
}}
"
>
{{
s
}}
</a>
-
<a
href=
"
{{
url
(
'stock:edit'
,
stock_id
=
s.id
)
}}
"
>
Edit
</a>
-
<a
href=
"
{{
url
(
'stock:shoppinglist_list'
,
stock_id
=
s.id
)
}}
"
>
{%
trans
%}
Shopping lists
{%
endtrans
%}
</a>
{%
endif
%}
...
...
stock/templates/stock/stock_shopping_list.jinja
View file @
0660ea5e
...
...
@@ -6,11 +6,11 @@ Shopping list for {{ stock }}
{%
block
content
%}
{%
if
current_tab
==
"stocks"
%}
<a
href=
"
{{
url
(
'stock:shoppinglist_create'
,
stock_id
=
stock.id
)
}}
"
>
{%
trans
%}
Do shopping
{%
endtrans
%}
</a>
<a
href=
"
{{
url
(
'stock:shoppinglist_create'
,
stock_id
=
stock.id
)
}}
"
>
{%
trans
%}
Create shopping list
{%
endtrans
%}
</a>
{%
endif
%}
<h3>
{%
trans
s
=
stock
%}
Shopping lists history for
{{
s
}}{%
endtrans
%}
</h3>
<h4>
To do
</h4>
<h4>
{%
trans
%}
To do
{%
endtrans
%}
</h4>
<table>
<thead>
<tr>
...
...
@@ -36,7 +36,7 @@ Shopping list for {{ stock }}
</tbody>
</table>
<h4>
Done
</h4>
<h4>
{%
trans
%}
Done
{%
endtrans
%}
</h4>
<table>
<thead>
<tr>
...
...
@@ -52,7 +52,7 @@ Shopping list for {{ stock }}
<td><a
href=
"
{{
url
(
'stock:shoppinglist_items'
,
stock_id
=
stock.id
,
shoppinglist_id
=
s.id
)
}}
"
>
{{
s.name
}}
</a></td>
<td>
{{
s.items_to_buy.count
()
}}
</td>
<td>
<a
href=
"
{{
url
(
'stock:shoppinglist_set_todo'
,
stock_id
=
stock.id
,
shoppinglist_id
=
s.id
)
}}
"
>
{%
trans
%}
Mark as todo
{%
endtrans
%}
</a>
<a
href=
"
{{
url
(
'stock:shoppinglist_set_todo'
,
stock_id
=
stock.id
,
shoppinglist_id
=
s.id
)
}}
"
>
{%
trans
%}
Mark as to
do
{%
endtrans
%}
</a>
</td>
<td>
<a
href=
"
{{
url
(
'stock:shoppinglist_delete'
,
stock_id
=
stock.id
,
shoppinglist_id
=
s.id
)
}}
"
>
{%
trans
%}
Delete
{%
endtrans
%}
</a>
...
...
stock/views.py
View file @
0660ea5e
...
...
@@ -170,7 +170,7 @@ class StockItemQuantityForm(forms.BaseForm):
shopping_list
.
stock_owner
=
self
.
stock
shopping_list
.
save
()
for
k
,
t
in
self
.
cleaned_data
.
items
():
if
t
is
not
None
:
if
int
(
t
)
>
0
:
item_id
=
int
(
k
[
5
:])
item
=
StockItem
.
objects
.
filter
(
id
=
item_id
).
first
()
item
.
tobuy_quantity
=
t
...
...
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