Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
basic
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
xrm
basic
Commits
42ba2167
Commit
42ba2167
authored
4 years ago
by
Sebastian Pongratz
Committed by
Johannes Goderbauer
4 years ago
Browse files
Options
Downloads
Patches
Plain Diff
#1055236 bugfix leadimport
parent
85d2f437
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
entity/Leadimport_entity/Leadimport_entity.aod
+2
-1
2 additions, 1 deletion
entity/Leadimport_entity/Leadimport_entity.aod
process/Leadimport_lib/process.js
+2
-2
2 additions, 2 deletions
process/Leadimport_lib/process.js
with
4 additions
and
3 deletions
entity/Leadimport_entity/Leadimport_entity.aod
+
2
−
1
View file @
42ba2167
...
...
@@ -242,6 +242,7 @@
<title>
Upload new file
</title>
<onActionProcess>
%aditoprj%/entity/Leadimport_entity/entityfields/uploadnewfile/onActionProcess.js
</onActionProcess>
<iconId>
VAADIN:UPLOAD_ALT
</iconId>
<state>
INVISIBLE
</state>
</entityActionField>
<entityField>
<name>
information
</name>
...
...
@@ -260,7 +261,7 @@
<onActionProcess>
%aditoprj%/entity/Leadimport_entity/entityfields/load_data/onActionProcess.js
</onActionProcess>
<isMenuAction
v=
"true"
/>
<iconId>
VAADIN:CLOUD_DOWNLOAD
</iconId>
<state>
INVISI
BLE
</state>
<state>
EDITA
BLE
</state>
</entityActionField>
<entityConsumer>
<name>
LeadTempC
</name>
...
...
This diff is collapsed.
Click to expand it.
process/Leadimport_lib/process.js
+
2
−
2
View file @
42ba2167
...
...
@@ -167,7 +167,7 @@ LeadImportUtils.importData = function(pDataFields, pDataTypes, pFieldDef, pField
var
persRet
;
//------create organisation
if
(
LeadValues
[
"
NAME
"
]
!=
""
)
//only if Organame is filled
if
(
LeadValues
[
"
NAME
"
]
.
trim
()
!=
""
)
//only if Organame is filled
{
orgObjID
=
"
Organisation
"
;
//for attribute
orgRet
=
LeadImportUtils
.
insertOrg
(
pDataFields
,
pDataTypes
,
pFieldDef
,
pFieldValues
,
pUser
,
pDate
);
...
...
@@ -183,7 +183,7 @@ LeadImportUtils.importData = function(pDataFields, pDataTypes, pFieldDef, pField
}
}
//------create person
if
(
LeadValues
[
"
LASTNAME
"
]
!=
""
)
//only if lastname is filled
if
(
LeadValues
[
"
LASTNAME
"
]
.
trim
()
!=
""
)
//only if lastname is filled
{
persObjID
=
"
Person
"
;
//for attribute
persRet
=
LeadImportUtils
.
insertPers
(
pDataFields
,
pDataTypes
,
pFieldDef
,
pFieldValues
,
orgid
,
LeadValues
,
pUser
,
pDate
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment