Commit 556dab7c authored by Etienne Allovon's avatar Etienne Allovon

Merge branch '2017.11' into...

Merge branch '2017.11' into 2411-confgend-can-not-generate-configuration-due-to-sqlalchemy-changes-for-security-purposes
parents 893e753a be8febf4
*.pyc
.tox
.*
!.git*
/build/
/coverage.xml
/env/
/nosetests.xml
/xivo_dao.egg-info/
xivo-dao (2017.03.19) xivo-five; urgency=medium
xivo-dao (2017.11.22) xivo-polaris; urgency=medium
* Fix incompatibility with security patch of SQLAlechemy
-- Jirka HLAVACEK <jhlavacek@avencall.com> Mon, 25 Mar 2019 13:21:17 +0100
xivo-dao (2017.10.00) xivo-dev; urgency=medium
* Set default values for new user:
- Ringing time : 20
- Simultaneous calls : 2
-- Vojtech Sodoma <vsodoma@avencall.com> Tue, 05 Sep 2017 09:59:04 +0200
xivo-dao (2017.09.00) xivo-dev; urgency=medium
* Disable creating extension out of context
-- Vojtech Sodoma <vsodoma@avencall.com> Tue, 25 Jul 2017 16:42:00 +0200
xivo-dao (2017.08.00) xivo-dev; urgency=medium
* bump version to 2017.08
-- Stepan Kabele <skabele@avencall.com> Tue, 18 Jul 2017 16:03:12 +0200
xivo-dao (2017.06.00) xivo-dev; urgency=medium
* Remove autopause 'yes' option
-- Vojtech Sodoma <vsodoma@avencall.com> Tue, 06 Jun 2017 10:56:09 +0200
xivo-dao (2017.05.00) xivo-dev; urgency=medium
* Update changelog to 2017.05.00
-- Tomas Taraba <ttaraba@avencall.com> Mon, 29 May 2017 17:04:23 +0200
xivo-dao (2017.03.09) xivo-dev; urgency=medium
* Fix return value on get user id from channel when protocol is not sip or return value is not int
......
......@@ -28,7 +28,7 @@ class Queue(Base):
__table_args__ = (
PrimaryKeyConstraint('name'),
Index('queue__idx__category', 'category'),
CheckConstraint("autopause in ('no', 'yes', 'all')")
CheckConstraint("autopause in ('no', 'all')")
)
name = Column(String(128))
......
......@@ -94,8 +94,8 @@ class UserFeatures(Base):
pictureid = Column(Integer)
entityid = Column(Integer)
callerid = Column(String(160))
ringseconds = Column(Integer, nullable=False, server_default='30')
simultcalls = Column(Integer, nullable=False, server_default='5')
ringseconds = Column(Integer, nullable=False, server_default='20')
simultcalls = Column(Integer, nullable=False, server_default='2')
enableclient = Column(Integer, nullable=False, server_default='0')
loginclient = Column(String(64), nullable=False, server_default='')
passwdclient = Column(String(64), nullable=False, server_default='')
......
......@@ -78,15 +78,15 @@ class ContextRange(NewModel):
self.did_length = 0
def in_range(self, exten):
exten = int(exten)
start = self._convert_limit(self.start)
end = self._convert_limit(self.end) if self.end else None
start = self._convert_limit(str(self.start))
end = self._convert_limit(str(self.end)) if self.end else None
if not end and exten == start:
return True
elif start <= exten <= end:
if not end:
if exten == start:
return True
elif len(exten) == len(end) and int(start) <= int(exten) <= int(end):
return True
return False
def _convert_limit(self, limit):
return int(limit[-self.did_length:])
return limit[-self.did_length:]
......@@ -533,8 +533,8 @@ class TestCreate(TestUser):
noanswer_destination=None,
unconditional_enabled=False,
unconditional_destination=None,
simultaneous_calls=5,
ring_seconds=30))
simultaneous_calls=2,
ring_seconds=20))
assert_that(row, has_properties(id=is_not(none()),
uuid=is_not(none()),
......
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