Skip to content

Commit

Permalink
Merge branch 'master' of git://github.com/flavour/eden
Browse files Browse the repository at this point in the history
  • Loading branch information
@flavour
flavour committed May 22, 2015
2 parents 2a32c34 + 3699e2f commit 806915d
Show file tree
Hide file tree
Showing 12 changed files with 200 additions and 217 deletions.
2 changes: 1 addition & 1 deletion VERSION
View file
@@ -1 +1 @@
nursix-1.1.0-devel-2350-g69418c1 (2015-05-21 15:05:44)
3167b92 (2015-05-22 10:30:50)
2 changes: 1 addition & 1 deletion modules/s3/s3navigation.py
View file
Expand Up @@ -1795,7 +1795,7 @@ def __call__(self, r, tabs=None, table=None, record=None, as_div = True):
tr.append(TH("%s: " % label))
v = value
if not isinstance(v, basestring) and \
not isinstance(value, A):
not isinstance(value, DIV):
try:
v = unicode(v)
except:
Expand Down
21 changes: 8 additions & 13 deletions modules/s3db/budget.py
View file
Expand Up @@ -769,9 +769,7 @@ def model(self):
#
tablename = "budget_kit_item"
define_table(tablename,
# This is a component, so needs to be a super_link
# - can't override field name, ondelete or requires
self.super_link("budget_entity_id", "budget_entity"),
budget_kit_id(),
budget_item_id(),
Field("quantity", "integer", notnull=True,
default = 1,
Expand Down Expand Up @@ -1536,29 +1534,26 @@ def budget_monitoring_onaccept(form):
query = (table.budget_entity_id == budget_entity_id) & \
(table.deleted == False) & \
(table.end_date < end_date)
max_field = table.end_date.max()
record = db(query).select(max_field,
record = db(query).select(table.end_date,
limitby=(0, 1),
orderby=max_field,
orderby=~(table.end_date),
).first()
if record and record[max_field] != start_date:
if record and record.end_date != start_date:
# Update this record's start_date
db(table.id == record_id).update(start_date = record[max_field])
db(table.id == record_id).update(start_date = record.end_date)

# Locate the immediately succeeding record
query = (table.budget_entity_id == budget_entity_id) & \
(table.deleted == False) & \
(table.end_date > end_date)
min_field = table.end_date.min()
record = db(query).select(table.id,
table.start_date,
min_field, # Needed for orderby on Postgres
limitby=(0, 1),
orderby=min_field,
orderby=table.end_date,
).first()
if record and record["budget_monitoring.start_date"] != end_date:
if record and record.start_date != end_date:
# Update that record's start_date
db(table.id == record["budget_monitoring.id"]).update(start_date = end_date)
record.update_record(start_date = end_date)

# -------------------------------------------------------------------------
@staticmethod
Expand Down
26 changes: 13 additions & 13 deletions modules/templates/CRMT/gis_config.csv
View file
@@ -1,17 +1,17 @@
UUID,Name,OU,OU Type,Default Country,Default L1,Default L2,Zoom,Lat,Lon,Projection,LatMin,LatMax,LonMin,LonMax,Geocoder,Marker,Image
SITE_DEFAULT,Default,,,US,California,Los Angeles County,9,34.026689,-118.210315,900913,32.9,44,-123,-111,True,empty,http://aidiq.com/downloads/LACRMT/Default.jpg
,Acton & Agua Dulce,Acton & Agua Dulce,org_group,US,California,Los Angeles County,12,34.4998267777,-118.216151487,900913,33.4,34.65,-120.56,-115.85,True,empty,http://aidiq.com/downloads/LACRMT/ActonAguaDulce.jpg
SITE_DEFAULT,Default,,,US,California,Los Angeles County,9,34.03,-118.21,900913,32.9,44,-123,-111,True,empty,http://aidiq.com/downloads/LACRMT/Default.jpg
,Acton & Agua Dulce,Acton & Agua Dulce,org_group,US,California,Los Angeles County,12,34.5,-118.22,900913,33.4,34.65,-120.56,-115.85,True,empty,http://aidiq.com/downloads/LACRMT/ActonAguaDulce.jpg
,Compton,Compton,org_group,US,California,Los Angeles County,13,33.9,-118.2,900913,33.8,34,-118.3,-118.1,True,empty,http://aidiq.com/downloads/LACRMT/Compton.jpg
,Culver City,Culver City,org_group,US,California,Los Angeles County,13,34.0042128627,-118.383323206,900913,33.4,34.65,-120.56,-115.85,True,empty,http://aidiq.com/downloads/LACRMT/CulverCity.jpg
,Culver City,Culver City,org_group,US,California,Los Angeles County,13,34,-118.38,900913,33.4,34.65,-120.56,-115.85,True,empty,http://aidiq.com/downloads/LACRMT/CulverCity.jpg
,Gardena,Gardena,org_group,US,California,Los Angeles County,13,33.9,-118.3,900913,33.8,34,-118.4,-118.2,True,empty,http://aidiq.com/downloads/LACRMT/Gardena.jpg
,Hawaiian Gardens,Hawaiian Gardens,org_group,US,California,Los Angeles County,14,33.83,-118.07,900913,33.8,33.85,-118.1,-118.04,True,empty,http://aidiq.com/downloads/LACRMT/HawaiianGardens.jpg
,Hawaiian Gardens,Hawaiian Gardens,org_group,US,California,Los Angeles County,15,33.83,-118.07,900913,33.8,33.85,-118.1,-118.04,True,empty,http://aidiq.com/downloads/LACRMT/HawaiianGardens.jpg
,Hollywood,Hollywood,org_group,US,California,Los Angeles County,15,34.094,-118.33,900913,34.07,34.12,-118.38,-118.29,True,empty,http://aidiq.com/downloads/LACRMT/Hollywood.jpg
,Huntington Park,Huntington Park,org_group,US,California,Los Angeles County,14,33.9776987662,-118.212546598,900913,33.4,34.65,-120.56,-115.85,True,empty,http://aidiq.com/downloads/LACRMT/HuntingtonPark.jpg
,La Crescenta-Montrose,La Crescenta-Montrose,org_group,US,California,Los Angeles County,13,34.2295135891,-118.212173745,900913,33.4,34.65,-120.56,-115.85,True,empty,http://aidiq.com/downloads/LACRMT/LaCrescentaMontrose.jpg
,Palms,Palms,org_group,US,California,Los Angeles County,15,34.09,-118.33,900913,34.07,34.12,-118.38,-118.29,True,empty,http://aidiq.com/downloads/LACRMT/Palms.jpg
,Pico-Union,Pico-Union,org_group,US,California,Los Angeles County,15,34.043884023,-118.280696165,900913,33.4,34.65,-120.56,-115.85,True,empty,http://aidiq.com/downloads/LACRMT/Pico-Union.jpg
,Pomona,Pomona,org_group,US,California,Los Angeles County,13,34.05,-117.74,900913,33.4,34.65,-120.56,-115.85,True,empty,http://aidiq.com/downloads/LACRMT/Pomona.jpg
,San Fernando,San Fernando,org_group,US,California,Los Angeles County,13,34.09,-118.1,900913,34.04,34.14,-118.24,-118,True,empty,http://aidiq.com/downloads/LACRMT/SanFernando.jpg
,San Gabriel,San Gabriel,org_group,US,California,Los Angeles County,14,38.09,-118.1,900913,34.05,34.15,-118.15,-118.02,True,empty,http://aidiq.com/downloads/LACRMT/SanGabriel.jpg
,Watts,Watts,org_group,US,California,Los Angeles County,14,33.9394689102,-118.230742704,900913,33.4,34.65,-120.56,-115.85,True,empty,http://aidiq.com/downloads/LACRMT/Watts.jpg
,Wilmington,Wilmington,org_group,US,California,Los Angeles County,13,33.7927621111,-118.238810789,900913,33.4,34.65,-120.56,-115.85,True,empty,http://aidiq.com/downloads/LACRMT/Wilmington.jpg
,Huntington Park,Huntington Park,org_group,US,California,Los Angeles County,14,33.98,-118.21,900913,33.4,34.65,-120.56,-115.85,True,empty,http://aidiq.com/downloads/LACRMT/HuntingtonPark.jpg
,La Crescenta-Montrose,La Crescenta-Montrose,org_group,US,California,Los Angeles County,14,34.23,-118.24,900913,33.4,34.65,-120.56,-115.85,True,empty,http://aidiq.com/downloads/LACRMT/LaCrescentaMontrose.jpg
,Palms,Palms,org_group,US,California,Los Angeles County,15,34.025,-118.41,900913,34,34.05,-118.45,-118.35,True,empty,http://aidiq.com/downloads/LACRMT/Palms.jpg
,Pico-Union,Pico-Union,org_group,US,California,Los Angeles County,15,34.04,-118.28,900913,33.4,34.65,-120.56,-115.85,True,empty,http://aidiq.com/downloads/LACRMT/Pico-Union.jpg
,Pomona,Pomona,org_group,US,California,Los Angeles County,13,34.06,-117.74,900913,33.4,34.65,-120.56,-115.85,True,empty,http://aidiq.com/downloads/LACRMT/Pomona.jpg
,San Fernando,San Fernando,org_group,US,California,Los Angeles County,14,34.29,-118.44,900913,34.26,34.32,-118.49,-118.37,True,empty,http://aidiq.com/downloads/LACRMT/SanFernando.jpg
,San Gabriel,San Gabriel,org_group,US,California,Los Angeles County,14,34.09,-118.1,900913,34.06,34.13,-118.15,-118.03,True,empty,http://aidiq.com/downloads/LACRMT/SanGabriel.jpg
,Watts,Watts,org_group,US,California,Los Angeles County,14,33.94,-118.23,900913,33.4,34.65,-120.56,-115.85,True,empty,http://aidiq.com/downloads/LACRMT/Watts.jpg
,Wilmington,Wilmington,org_group,US,California,Los Angeles County,13,33.79,-118.24,900913,33.4,34.65,-120.56,-115.85,True,empty,http://aidiq.com/downloads/LACRMT/Wilmington.jpg

0 comments on commit 806915d

Please sign in to comment.