Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
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
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Boxiang Sun
erp5
Commits
58ec3221
Commit
58ec3221
authored
Nov 12, 2013
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
more fixes to ingestion from user login revert
parent
9a5a0788
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
6 deletions
+7
-6
bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/Document_getPropertyDictFromUserLogin.xml
.../erp5_ingestion/Document_getPropertyDictFromUserLogin.xml
+1
-0
bt5/erp5_ingestion/bt/revision
bt5/erp5_ingestion/bt/revision
+1
-1
product/ERP5OOo/tests/testIngestion.py
product/ERP5OOo/tests/testIngestion.py
+5
-5
No files found.
bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/Document_getPropertyDictFromUserLogin.xml
View file @
58ec3221
...
...
@@ -59,6 +59,7 @@ assignment_dict = context.ERP5Site_getPersonAssignmentDict(user_name=user_name)\
\n
# XXX: make list of properties configurable through preferences\n
return {\'group_list\': assignment_dict[\'group_list\'],\n
\'site_list\': assignment_dict[\'site_list\'],\n
\'function_list\': assignment_dict[\'function_list\']}\n
</string>
</value>
</item>
...
...
bt5/erp5_ingestion/bt/revision
View file @
58ec3221
150
\ No newline at end of file
151
\ No newline at end of file
product/ERP5OOo/tests/testIngestion.py
View file @
58ec3221
...
...
@@ -1457,16 +1457,16 @@ class TestIngestion(ERP5TypeTestCase):
user
=
self
.
createUser
(
reference
=
'contributor1'
)
assignment
=
self
.
createUserAssignment
(
user
,
\
dict
(
group
=
'anybody'
,
function
=
'
function/
musician/wind/saxophone'
,
site
=
'
site/
arctic/spitsbergen'
))
function
=
'musician/wind/saxophone'
,
site
=
'arctic/spitsbergen'
))
portal
.
document_module
.
manage_setLocalRoles
(
'contributor1'
,
[
'Assignor'
,])
self
.
tic
()
file_object
=
makeFileUpload
(
'TEST-en-002.doc'
)
document
=
contribution_tool
.
newContent
(
file
=
file_object
)
document
.
discoverMetadata
(
document
.
get
SourceReferenc
e
(),
'contributor1'
)
document
.
discoverMetadata
(
document
.
get
Filenam
e
(),
'contributor1'
)
self
.
tic
()
self
.
assertEquals
(
document
.
get
SourceReferenc
e
(),
'TEST-en-002.doc'
)
self
.
assertEquals
(
'
function/
musician/wind/saxophone'
,
document
.
getFunction
())
self
.
assertEquals
(
document
.
get
Filenam
e
(),
'TEST-en-002.doc'
)
self
.
assertEquals
(
'musician/wind/saxophone'
,
document
.
getFunction
())
self
.
assertEquals
(
'anybody'
,
document
.
getGroup
())
self
.
assertEquals
(
'arctic/spitsbergen'
,
document
.
getSite
())
...
...
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