Commit a927f63c authored by Alain Takoudjou's avatar Alain Takoudjou Committed by Rafael Monnerat

better display of instances connection parameters

parent 35b57e5a
...@@ -59,14 +59,14 @@ for instance in context.getPredecessorValueList():\n ...@@ -59,14 +59,14 @@ for instance in context.getPredecessorValueList():\n
break\n break\n
\n \n
if found:\n if found:\n
result = instance.SoftwareInstance_getConnectionParameterList()\n result = instance.SoftwareInstance_getConnectionParameterList(type)\n
\n \n
return result\n return result\n
</string> </value> </string> </value>
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>*args, **kwargs</string> </value> <value> <string>type=None, **kwargs</string> </value>
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
......
...@@ -104,13 +104,13 @@ ...@@ -104,13 +104,13 @@
<string>your_ad</string> <string>your_ad</string>
<string>my_url_string</string> <string>my_url_string</string>
<string>my_source_reference</string> <string>my_source_reference</string>
<string>info</string>
<string>last_event_listbox</string> <string>last_event_listbox</string>
<string>your_status</string> <string>your_status</string>
<string>your_instance_xml</string> <string>your_instance_xml</string>
<string>my_update_button</string> <string>my_update_button</string>
<string>my_start_button</string> <string>my_start_button</string>
<string>my_stop_button</string> <string>my_stop_button</string>
<string>info</string>
<string>your_connection_listbox</string> <string>your_connection_listbox</string>
<string>your_monitoring_status</string> <string>your_monitoring_status</string>
</list> </list>
......
...@@ -233,7 +233,7 @@ ...@@ -233,7 +233,7 @@
</item> </item>
<item> <item>
<key> <string>extra</string> </key> <key> <string>extra</string> </key>
<value> <string>style=\'background:white; margin:6px; color:red\'</string> </value> <value> <string>style=\'background-color: #E1FFF5; padding: 6px; color: #4F9073; border: 1px solid #D5E5FB; text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); line-height: 25px; margin: 10px 0;\'</string> </value>
</item> </item>
<item> <item>
<key> <string>height</string> </key> <key> <string>height</string> </key>
...@@ -289,7 +289,7 @@ ...@@ -289,7 +289,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string>python: "\\n".join([i.connection_value for i in here.HostingSubscription_getConnectionParameterList() if i.connection_key.endswith("_info")])</string> </value> <value> <string>python: "\\n".join([i.connection_value for i in here.HostingSubscription_getConnectionParameterList(type=\'info\') if i.connection_key.endswith("_info")])</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
...@@ -302,7 +302,7 @@ ...@@ -302,7 +302,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string>python: len(here.HostingSubscription_getConnectionParameterList())</string> </value> <value> <string>python: len(here.HostingSubscription_getConnectionParameterList(type=\'info\'))</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
...@@ -62,16 +62,20 @@ if connection_dict is None:\n ...@@ -62,16 +62,20 @@ if connection_dict is None:\n
return return_list\n return return_list\n
\n \n
portal = context.getPortalObject()\n portal = context.getPortalObject()\n
for k, v in connection_dict.iteritems():\n for k in sorted(connection_dict):\n
if type == \'info\' and not k.endswith(\'_info\'):\n
continue\n
elif not type and k.endswith(\'_info\'):\n
continue\n
d = newTempDocument(portal, \'temp\')\n d = newTempDocument(portal, \'temp\')\n
d.edit(connection_key=k, connection_value=v)\n d.edit(connection_key=k, connection_value=connection_dict[k])\n
return_list.append(d)\n return_list.append(d)\n
return return_list\n return return_list\n
</string> </value> </string> </value>
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>*args, **kwargs</string> </value> <value> <string>type=None, **kwargs</string> </value>
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
......
...@@ -103,6 +103,7 @@ ...@@ -103,6 +103,7 @@
<key> <string>normal bis</string> </key> <key> <string>normal bis</string> </key>
<value> <value>
<list> <list>
<string>info</string>
<string>your_connection_listbox</string> <string>your_connection_listbox</string>
<string>my_text_content</string> <string>my_text_content</string>
</list> </list>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment