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
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
Lu Xu
slapos.core
Commits
8824e7bb
Commit
8824e7bb
authored
9 years ago
by
Alain Takoudjou
Committed by
Rafael Monnerat
9 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add newer ticket in the listbox if it still not indexed yet
parent
f1f87c14
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
2 deletions
+16
-2
master/bt5/slapos_web/SkinTemplateItem/portal_skins/vifib_hosting/WebSection_getUserTicketList.xml
...rtal_skins/vifib_hosting/WebSection_getUserTicketList.xml
+14
-1
master/bt5/slapos_web/SkinTemplateItem/portal_skins/vifib_hosting/WebSection_registerNewTicket.xml
...rtal_skins/vifib_hosting/WebSection_registerNewTicket.xml
+2
-1
No files found.
master/bt5/slapos_web/SkinTemplateItem/portal_skins/vifib_hosting/WebSection_getUserTicketList.xml
View file @
8824e7bb
...
@@ -52,12 +52,25 @@
...
@@ -52,12 +52,25 @@
<key>
<string>
_body
</string>
</key>
<key>
<string>
_body
</string>
</key>
<value>
<string>
portal = context.getPortalObject()\n
<value>
<string>
portal = context.getPortalObject()\n
kw[\'portal_type\'] = ["Support Request", "Regularisation Request", "Upgrade Decision"]\n
kw[\'portal_type\'] = ["Support Request", "Regularisation Request", "Upgrade Decision"]\n
support_in_progress_url = context.REQUEST.get(\'new_support_request\', \'\')\n
\n
\n
person = portal.ERP5Site_getAuthenticatedMemberPersonValue()\n
person = portal.ERP5Site_getAuthenticatedMemberPersonValue()\n
if person:\n
if person:\n
kw[\'default_destination_decision_uid\'] = person.getUid()\n
kw[\'default_destination_decision_uid\'] = person.getUid()\n
kw[\'sort_on\'] = [(\'modification_date\', \'DESC\'),]\n
kw[\'sort_on\'] = [(\'modification_date\', \'DESC\'),]\n
return context.getPortalObject().portal_catalog(**kw)\n
found = False\n
support_request_list = []\n
for support_request in context.getPortalObject().portal_catalog(**kw):\n
if support_in_progress_url and \\\n
support_request.getRelativeUrl() == support_in_progress_url:\n
found = True\n
support_request_list.append(support_request)\n
if support_in_progress_url and not found:\n
support_in_progress = portal.restrictedTraverse(\n
support_in_progress_url, None)\n
if support_in_progress and support_in_progress.getDestinationDecisionUid() == person.getUid():\n
support_request_list.insert(0, support_in_progress)\n
return support_request_list\n
\n
\n
else:\n
else:\n
return []\n
return []\n
...
...
This diff is collapsed.
Click to expand it.
master/bt5/slapos_web/SkinTemplateItem/portal_skins/vifib_hosting/WebSection_registerNewTicket.xml
View file @
8824e7bb
...
@@ -53,6 +53,7 @@
...
@@ -53,6 +53,7 @@
<value>
<string>
portal = context.getPortalObject()\n
<value>
<string>
portal = context.getPortalObject()\n
web_site = context.getWebSiteValue()\n
web_site = context.getWebSiteValue()\n
person = portal.ERP5Site_getAuthenticatedMemberPersonValue()\n
person = portal.ERP5Site_getAuthenticatedMemberPersonValue()\n
context.REQUEST.set(\'new_support_request\', None)\n
\n
\n
support_request_template = portal.restrictedTraverse(\n
support_request_template = portal.restrictedTraverse(\n
portal.portal_preferences.getPreferredSupportRequestTemplate())\n
portal.portal_preferences.getPreferredSupportRequestTemplate())\n
...
@@ -83,7 +84,7 @@ web_message.edit(\n
...
@@ -83,7 +84,7 @@ web_message.edit(\n
web_message.stop(comment="Submitted from the web site contact form")\n
web_message.stop(comment="Submitted from the web site contact form")\n
\n
\n
# Redirect to web site to hide the indexation process\n
# Redirect to web site to hide the indexation process\n
web_site.
Base_redirect(\'view\', keep_items={\'editable_mode\': 0
, \'portal_status_message\':context.Base_translateString(\'Ticket created.\')})\n
web_site.
myspace.help.Base_redirect(\'\', keep_items={\'editable_mode\': 0, \'new_support_request\': support_request.getRelativeUrl()
, \'portal_status_message\':context.Base_translateString(\'Ticket created.\')})\n
</string>
</value>
</string>
</value>
</item>
</item>
<item>
<item>
...
...
This diff is collapsed.
Click to expand it.
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