kopia lustrzana https://github.com/hholzgra/maposmatic/
extra logo hack
rodzic
2a40a57a20
commit
febb510b3c
|
@ -462,6 +462,7 @@ class JobRenderer(threading.Thread):
|
|||
|
||||
config.logo = self.job.logo
|
||||
config.extra_logo = self.job.extra_logo
|
||||
config.extra_text = self.job.extra_text
|
||||
|
||||
config.stylesheet = renderer.get_stylesheet_by_name(
|
||||
self.job.stylesheet)
|
||||
|
|
|
@ -113,6 +113,7 @@ class MapRenderingJob(models.Model):
|
|||
submittermail = models.EmailField(null=True,blank=True)
|
||||
index_queue_at_submission = models.IntegerField()
|
||||
map_language = models.CharField(max_length=16, null=True, blank=True, default='en_US.UTF-8')
|
||||
extra_text = models.CharField(max_length=200, null=True, blank=True)
|
||||
|
||||
renderstep = models.CharField(max_length=80,null=True,blank=True)
|
||||
|
||||
|
|
|
@ -50,6 +50,8 @@ import www.settings
|
|||
|
||||
import psycopg2
|
||||
|
||||
from ipware import get_client_ip
|
||||
|
||||
LOG = logging.getLogger('maposmatic')
|
||||
|
||||
def index(request):
|
||||
|
@ -177,6 +179,13 @@ def new(request):
|
|||
.queue_size(job.queue) + 1)
|
||||
job.nonce = helpers.generate_nonce(models.MapRenderingJob.NONCE_SIZE)
|
||||
|
||||
client_ip, is_routable = get_client_ip(request)
|
||||
LOG.warning("client IP is %s" % client_ip)
|
||||
if client_ip is not None and client_ip == www.settings.SPECIAL_IP:
|
||||
job.extra_text = "Karte gedruckt vom FOSSGIS e.V."
|
||||
job.logo = "bundled:FOSSGIS_Logo.svg"
|
||||
job.extra_logo = "bundled:osm-logo.svg"
|
||||
|
||||
job.save()
|
||||
|
||||
files = request.FILES.getlist('uploadfile')
|
||||
|
@ -345,6 +354,7 @@ def recreate(request):
|
|||
|
||||
newjob.logo = job.logo
|
||||
newjob.extra_logo = job.extra_logo
|
||||
newjob.extra_text = job.extra_text
|
||||
|
||||
newjob.queue = "default"
|
||||
if job.layout.startswith('multi'):
|
||||
|
|
Ładowanie…
Reference in New Issue