backup/ROC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into es_17_01

Browse Source
This commit is contained in:
Jocelyn FIAT
2017-03-01 12:39:01 +01:00
parent 3d2770e759 e89b04cbd2
commit 1fdb80b14b
3 changed files with 36 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/messaging/messaging-safe.ecf
View File

@@ -2,7 +2,7 @@
<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-15-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-15-0 http://www.eiffel.com/developers/xml/configuration-1-15-0.xsd" name="messaging" uuid="939C9362-FD46-4B4F-BB36-A593089430AB" library_target="messaging">
<target name="messaging">
<root all_classes="true"/>
<option>
<option void_safety="all">
</option>
<setting name="concurrency" value="scoop"/>
<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>

20
modules/messaging/messaging.ecf Normal file
View File

@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-15-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-15-0 http://www.eiffel.com/developers/xml/configuration-1-15-0.xsd" name="messaging" uuid="939C9362-FD46-4B4F-BB36-A593089430AB" library_target="messaging">
<target name="messaging">
<root all_classes="true"/>
<option>
</option>
<setting name="concurrency" value="scoop"/>
<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
<library name="cms" location="..\..\cms.ecf" readonly="false"/>
<library name="cms_app_env" location="..\..\library\app_env\app_env.ecf" readonly="false"/>
<library name="cms_model" location="..\..\library\model\cms_model.ecf" readonly="false"/>
<library name="error" location="$ISE_LIBRARY\contrib\library\utility\general\error\error.ecf"/>
<library name="http" location="$ISE_LIBRARY\contrib\library\network\protocol\http\http.ecf"/>
<library name="time" location="$ISE_LIBRARY\library\time\time.ecf"/>
<library name="wsf" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf.ecf"/>
<library name="wsf_encoder" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\text\encoder\encoder.ecf"/>
<library name="wsf_html" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf_html\wsf_html.ecf"/>
<cluster name="src" location="src\" recursive="true"/>
</target>
</system>

15
src/service/cms_api_import_imp.e
View File

@@ -218,6 +218,7 @@ feature -- Import
json_to_user (j: JSON_OBJECT): detachable CMS_USER
local
l_roles: ARRAYED_LIST [CMS_USER_ROLE]
s: STRING_32
do
if attached json_string_item (j, "name") as l_name and then not l_name.is_whitespace then
create Result.make (l_name)
@@ -227,6 +228,20 @@ feature -- Import
end
if attached json_string_8_item (j, "profile_name") as l_profile_name then
Result.set_profile_name (l_profile_name)
else
create s.make_empty
if attached json_string_8_item (j, "profile_firstname") as l_profile_firstname then
s.append (l_profile_firstname)
end
if attached json_string_8_item (j, "profile_lastname") as l_profile_lastname then
if not s.is_empty then
s.append_character (' ')
end
s.append (l_profile_lastname)
end
if not s.is_empty then
Result.set_profile_name (s)
end
end
if attached {JSON_ARRAY} j.item ("roles") as j_roles then