Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
slapos.core
Commits
21c8710e
Commit
21c8710e
authored
Mar 28, 2012
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Store also removal history.
parent
5d305f69
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
5 deletions
+11
-5
master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/Person_getOpenOrderDifference.xml
...portal_skins/vifib_slap/Person_getOpenOrderDifference.xml
+6
-3
master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/Person_updateOpenOrder.xml
...teItem/portal_skins/vifib_slap/Person_updateOpenOrder.xml
+4
-1
master/bt5/vifib_slap/bt/revision
master/bt5/vifib_slap/bt/revision
+1
-1
No files found.
master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/Person_getOpenOrderDifference.xml
View file @
21c8710e
...
...
@@ -163,8 +163,11 @@ for (key, value) in modify_kw_kw.copy().iteritems():\n
remove_id_list =
set()\n
if
previous_open_sale_order
is
not
None:\n
for
(remove_hosting,
explanation)
in
remove_hosting_list:\n
if
remove_hosting
in
add_kw_kw
or
remove_hosting
in
modify_kw_kw:\n
#
just
added,
cannot
remove
yet\n
if
remove_hosting
in
add_kw_kw:\n
add_kw_kw[remove_hosting][\'explanation\'].append(\'Not
removed
because
just
added\')\n
continue\n
if
remove_hosting
in
modify_kw_kw:\n
modify_kw_kw[remove_hosting][\'explanation\'].append(\'Not
removed
because
just
modified\')\n
continue\n
if
remove_hosting
in
hosting_subscription_mapping:\n
line =
previous_open_sale_order[hosting_subscription_mapping.get(remove_hosting)]\n
...
...
@@ -174,7 +177,7 @@ if previous_open_sale_order is not None:\n
if
order_line.getSimulationState()
==
\'cancelled\':\n
order_line_cancelled =
True\n
if
order_line_cancelled
or
(line.getStartDate()
is
not
None
and
line.getStopDate()
is
not
None
and
line.getStartDate()
<
line.getStopDate()):\n
remove_id_list.add(
line.getId(
))\n
remove_id_list.add(
(line.getId(),
\'Removed
%s\'
%
line.getPath()
))\n
return
add_kw_kw,
modify_kw_kw,
hs_modify_kw_kw,
list(remove_id_list)\n
...
...
master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/Person_updateOpenOrder.xml
View file @
21c8710e
...
...
@@ -118,7 +118,10 @@ for hs, kw in modify_kw_kw.iteritems():\n
for explanation in explanation_list:\n
storeWorkflowComment(line, explanation)\n
\n
open_sale_order.deleteContent(remove_id_list)\n
open_sale_order.deleteContent([q[0] for q in remove_id_list])\n
for explanation in remove_id_list:\n
storeWorkflowComment(open_sale_order, explanation[1])\n
\n
if previous_open_sale_order is not None:\n
previous_open_sale_order.setExpirationDate(now, activate_kw=activate_kw)\n
\n
...
...
master/bt5/vifib_slap/bt/revision
View file @
21c8710e
685
\ No newline at end of file
686
\ No newline at end of file
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