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
4fa4531e
Commit
4fa4531e
authored
Mar 15, 2012
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master' into versionoso
Conflicts: master/bt5/vifib_upgrader/bt/revision
parents
99a1793c
f9828d96
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
master/bt5/vifib_upgrader/SkinTemplateItem/portal_skins/vifib_upgrader/SaleTradeCondition_deleteIfNotNeeded.xml
...s/vifib_upgrader/SaleTradeCondition_deleteIfNotNeeded.xml
+1
-1
master/bt5/vifib_upgrader/bt/revision
master/bt5/vifib_upgrader/bt/revision
+1
-1
No files found.
master/bt5/vifib_upgrader/SkinTemplateItem/portal_skins/vifib_upgrader/SaleTradeCondition_deleteIfNotNeeded.xml
View file @
4fa4531e
...
...
@@ -53,7 +53,7 @@
<value>
<string>
assert(context.getPortalType() == \'Sale Trade Condition\')\n
\n
if context.getTitle() == \'ViFiB Custom Conditions\':\n
assert(len(
context.getSpecialiseRelatedValueList()
) == 0)\n
assert(len(
[q for q in context.getSpecialiseRelatedValueList() if q.getPortalType() in context.getPortalDeliveryTypeList()]
) == 0)\n
assert(len(context.contentValues()) == 0)\n
context.getParentValue().deleteContent(id=context.getId())\n
</string>
</value>
...
...
master/bt5/vifib_upgrader/bt/revision
View file @
4fa4531e
78
\ No newline at end of file
79
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