@@ -68,20 +68,14 @@
-
-
+ Obvestilo o obdelavi osebnih podatkov - +
diff --git a/app.py b/app.py index e79ac11..63910f4 100644 --- a/app.py +++ b/app.py @@ -281,7 +281,6 @@ def solar(text): @app.route('/solar/pogodbe', methods=['POST']) @login_required def solar_upload_contract(): - logging.info('TESTTTTTT') if not portal.base.has_user_corpus_access(current_user.id, 'solar'): return 404 return upload_handler_solar.handle_contract_upload(request, current_user.get_id()) diff --git a/migrations/versions/7d6db184b8fc_permissions_and_solar_stuff.py b/migrations/versions/7d6db184b8fc_permissions_and_solar_stuff.py index 9f5a2f3..15d0c3d 100644 --- a/migrations/versions/7d6db184b8fc_permissions_and_solar_stuff.py +++ b/migrations/versions/7d6db184b8fc_permissions_and_solar_stuff.py @@ -42,6 +42,7 @@ def upgrade(): op.add_column('upload_predavanja', sa.Column('agree_publish_future', sa.TEXT(), nullable=False)) op.add_column('upload_predavanja', sa.Column('agree_machine_translation', sa.BOOLEAN(), nullable=False)) op.add_column('upload_predavanja', sa.Column('agree_news_cjvt', sa.BOOLEAN(), nullable=False)) + op.drop_column('upload_predavanja', 'agree_publish') # ### end Alembic commands ### @@ -52,4 +53,8 @@ def downgrade(): op.drop_table('corpus_access') op.drop_table('contracts_solar') op.drop_column('registered_user', 'institution_moderator') + op.drop_column('upload_predavanja', 'agree_publish_future') + op.drop_column('upload_predavanja', 'agree_machine_translation') + op.drop_column('upload_predavanja', 'agree_news_cjvt') + op.add_column('upload_predavanja', sa.Column('agree_publish', sa.Boolean(), nullable=False)) # ### end Alembic commands ### diff --git a/portal/base.py b/portal/base.py index 6eef8ed..c856060 100644 --- a/portal/base.py +++ b/portal/base.py @@ -152,7 +152,7 @@ class UploadHandler: f.save(path / f.filename) - def send_confirm_mail(self, upload_metadata): + def send_confirm_mail(self, upload_metadata, attach_contract_file=False): upload_id = upload_metadata['upload_id'] message = MIMEMultipart() @@ -162,17 +162,18 @@ class UploadHandler: body = self.config['MAIL_BODY'].format(upload_id=upload_id) message.attach(MIMEText(body, "plain")) - contracts_dir = self.contract_creator.base - f_name = upload_metadata['contract_file'] - sub_dir = contracts_dir / Path(f_name[:2]) - contract_file = sub_dir / Path(f_name[2:]) - with open(contract_file, "rb") as f: - part = MIMEApplication( - f.read(), - Name = f_name - ) - part['Content-Disposition'] = 'attachment; filename="%s"' % f_name - message.attach(part) + if attach_contract_file: + contracts_dir = self.contract_creator.base + f_name = upload_metadata['contract_file'] + sub_dir = contracts_dir / Path(f_name[:2]) + contract_file = sub_dir / Path(f_name[2:]) + with open(contract_file, "rb") as f: + part = MIMEApplication( + f.read(), + Name = f_name + ) + part['Content-Disposition'] = 'attachment; filename="%s"' % f_name + message.attach(part) text = message.as_string() diff --git a/portal/model.py b/portal/model.py index f56718a..e5eee45 100644 --- a/portal/model.py +++ b/portal/model.py @@ -40,7 +40,6 @@ class UploadPredavanja(db.Model): email = db.Column(db.String, nullable=False) phone = db.Column(db.String, nullable=True) keywords = db.Column(db.String, nullable=False) - agree_publish = db.Column(db.Boolean, nullable=False) agree_publish_future = db.Column(db.String, nullable=False) agree_machine_translation = db.Column(db.Boolean, default=False, nullable=False) agree_news_cjvt = db.Column(db.Boolean, default=False, nullable=False) diff --git a/portal/predavanja.py b/portal/predavanja.py index 7e35fcb..898522b 100644 --- a/portal/predavanja.py +++ b/portal/predavanja.py @@ -53,7 +53,6 @@ class UploadHandlerPredavanja(UploadHandler): email=form_data['email'], phone=form_data.get('phone'), keywords=form_data['kljucne-besede'], - agree_publish=True if 'kljucne-besde' in form_data else False, agree_publish_future=form_data['javna-objava-prihodnost'], agree_machine_translation=True if 'strojno-prevajanje' in form_data else False, agree_news_cjvt=True if 'obvestila' in form_data else False, @@ -80,16 +79,13 @@ class UploadHandlerPredavanja(UploadHandler): logging.info('Upload for "predavanja" with id "{}" supplied form data: {}'.format( upload_metadata['upload_id'], str(upload_metadata['form_data']))) - # Generate contract PDF file based on the uploads metadata. - self.generate_upload_contract_pdf(upload_metadata) - # Store uploaded files to disk. self.store_datafiles(request.files, upload_metadata) # Store metadata to database. self.store_metadata(upload_metadata) - # Send confirmation mail along with the contract to the submitted email address. + # Send confirmation mail self.send_confirm_mail(upload_metadata) return 'Uspešno ste oddali datotek(e). Št. datotek: {}'.format(len(request.files)) diff --git a/portal/regular.py b/portal/regular.py index 74f164d..f707ae2 100644 --- a/portal/regular.py +++ b/portal/regular.py @@ -89,7 +89,7 @@ class UploadHandlerRegular(UploadHandler): self.store_metadata(upload_metadata, corpus_name) # Send confirmation mail along with the contract to the submitted email address. - self.send_confirm_mail(upload_metadata) + self.send_confirm_mail(upload_metadata, attach_contract_file=True) return 'Uspešno ste oddali datotek(e). Št. datotek: {}'.format(len(request.files)) diff --git a/templates/basic-predavanja.html b/templates/basic-predavanja.html index 06b8529..13d2ef7 100644 --- a/templates/basic-predavanja.html +++ b/templates/basic-predavanja.html @@ -8,7 +8,7 @@ {{ dropzone.style('position: absolute; top: -0.5px; width: 388px; - height: 1232px; + height: 831px; left: 385px; background: linear-gradient(198.62deg, rgba(255, 255, 255, 0.49) -1.62%, rgba(255, 255, 255, 0.73) -1.61%, rgba(255, 255, 255, 0.41) 79.34%); box-shadow: 20px 4px 40px rgba(0, 0, 0, 0.25); @@ -18,9 +18,9 @@
-