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
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tatuya Kamada
erp5
Commits
e9b00534
Commit
e9b00534
authored
Nov 03, 2014
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Support assignments with a start date but without stop date
parent
f88a2f32
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
37 additions
and
3 deletions
+37
-3
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_stop_date.xml
...ns/erp5_base/Assignment_viewFieldLibrary/my_stop_date.xml
+35
-1
product/ERP5Security/ERP5KeyAuthPlugin.py
product/ERP5Security/ERP5KeyAuthPlugin.py
+1
-1
product/ERP5Security/ERP5UserManager.py
product/ERP5Security/ERP5UserManager.py
+1
-1
No files found.
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_stop_date.xml
View file @
e9b00534
...
@@ -10,8 +10,9 @@
...
@@ -10,8 +10,9 @@
<key>
<string>
delegated_list
</string>
</key>
<key>
<string>
delegated_list
</string>
</key>
<value>
<value>
<list>
<list>
<string>
title
</string>
<string>
default
</string>
<string>
description
</string>
<string>
description
</string>
<string>
title
</string>
</list>
</list>
</value>
</value>
</item>
</item>
...
@@ -53,6 +54,16 @@
...
@@ -53,6 +54,16 @@
<key>
<string>
tales
</string>
</key>
<key>
<string>
tales
</string>
</key>
<value>
<value>
<dictionary>
<dictionary>
<item>
<key>
<string>
default
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAI=
</string>
</persistent>
</value>
</item>
<item>
<key>
<string>
description
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<item>
<key>
<string>
field_id
</string>
</key>
<key>
<string>
field_id
</string>
</key>
<value>
<string></string>
</value>
<value>
<string></string>
</value>
...
@@ -65,6 +76,10 @@
...
@@ -65,6 +76,10 @@
<key>
<string>
target
</string>
</key>
<key>
<string>
target
</string>
</key>
<value>
<string></string>
</value>
<value>
<string></string>
</value>
</item>
</item>
<item>
<key>
<string>
title
</string>
</key>
<value>
<string></string>
</value>
</item>
</dictionary>
</dictionary>
</value>
</value>
</item>
</item>
...
@@ -72,6 +87,12 @@
...
@@ -72,6 +87,12 @@
<key>
<string>
values
</string>
</key>
<key>
<string>
values
</string>
</key>
<value>
<value>
<dictionary>
<dictionary>
<item>
<key>
<string>
default
</string>
</key>
<value>
<none/>
</value>
</item>
<item>
<item>
<key>
<string>
description
</string>
</key>
<key>
<string>
description
</string>
</key>
<value>
<string>
The End date of an operation
</string>
</value>
<value>
<string>
The End date of an operation
</string>
</value>
...
@@ -98,4 +119,17 @@
...
@@ -98,4 +119,17 @@
</dictionary>
</dictionary>
</pickle>
</pickle>
</record>
</record>
<record
id=
"2"
aka=
"AAAAAAAAAAI="
>
<pickle>
<global
name=
"TALESMethod"
module=
"Products.Formulator.TALESField"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
_text
</string>
</key>
<value>
<string>
python: context.hasStopDate() and context.getStopDate()
</string>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
</ZopeData>
product/ERP5Security/ERP5KeyAuthPlugin.py
View file @
e9b00534
...
@@ -355,7 +355,7 @@ class ERP5KeyAuthPlugin(ERP5UserManager, CookieAuthHelper):
...
@@ -355,7 +355,7 @@ class ERP5KeyAuthPlugin(ERP5UserManager, CookieAuthHelper):
if
assignment
.
getStartDate
()
is
not
None
and
\
if
assignment
.
getStartDate
()
is
not
None
and
\
assignment
.
getStartDate
()
>
login_date
:
assignment
.
getStartDate
()
>
login_date
:
continue
continue
if
assignment
.
getStopDate
()
is
not
None
and
\
if
assignment
.
hasStopDate
()
and
\
assignment
.
getStopDate
()
<
login_date
:
assignment
.
getStopDate
()
<
login_date
:
continue
continue
valid_assignment_list
.
append
(
assignment
)
valid_assignment_list
.
append
(
assignment
)
...
...
product/ERP5Security/ERP5UserManager.py
View file @
e9b00534
...
@@ -150,7 +150,7 @@ class ERP5UserManager(BasePlugin):
...
@@ -150,7 +150,7 @@ class ERP5UserManager(BasePlugin):
if
assignment
.
getStartDate
()
is
not
None
and
\
if
assignment
.
getStartDate
()
is
not
None
and
\
assignment
.
getStartDate
()
>
login_date
:
assignment
.
getStartDate
()
>
login_date
:
continue
continue
if
assignment
.
getStopDate
()
is
not
None
and
\
if
assignment
.
hasStopDate
()
and
\
assignment
.
getStopDate
()
<
login_date
:
assignment
.
getStopDate
()
<
login_date
:
continue
continue
valid_assignment_list
.
append
(
assignment
)
valid_assignment_list
.
append
(
assignment
)
...
...
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