3ae77833389609a2c958c745e47086ece9efef73,modules/s3/s3gis.py,GIS,set_config,#Any#Any#,1265

Before Change

                                    left=left,
                                    orderby=ctable.pe_type,
                                    limitby=(0, 2))
            if len(rows) == 1:
                // The requested config must be invalid, so just use site default
                row = rows.first()

        elif config_id == 0:
            // Use site default
            query = (ctable.uuid == "SITE_DEFAULT")
            // May well not be complete, so Left Join

After Change

        row = None
        rows = None
        if config_id:
            row = db(ctable.id == config_id).select(ctable.merge,
                                                    limitby= (0, 1)
                                                    ).first()
            if row:
                // May well not be complete, so Left Join
                left = (ptable.on(ptable.id == ctable.projection_id),
                        stable.on((stable.config_id == ctable.id) & \
                                  (stable.layer_id == None)),
                        mtable.on(mtable.id == stable.marker_id),
                        )
                if row.merge:
                    // Merge this one with the Site Default
                    query = (ctable.id == config_id) | \
                            (ctable.uuid == "SITE_DEFAULT")

Instances