fixes for bugs discovered in meeting

portal/base.py

@@ -405,22 +405,30 @@ def update_user_name(user_id, new_name):
     db.session.commit()
     return rowcount
 
+def update_institution_data(institution_id, new_name, new_region):
+    rowcount = db.session.query(Institution).filter_by(id=institution_id).update({'name': new_name, 'region': new_region})
+    db.session.commit()
+    return rowcount
+
 
 def remove_user(user_id):
-    #db.session.query(UserCooperationHistory).filter(UserCooperationHistory.user == user_id).delete()
-    #db.session.query(UserInstitutionMapping).filter(UserInstitutionMapping.user == user_id).delete()
-    #db.session.query(RegisteredUser).filter(RegisteredUser.id == user_id).delete()
+    db.session.query(UserCooperationHistory).filter(UserCooperationHistory.user == user_id).delete()
+    db.session.query(UserInstitutionMapping).filter(UserInstitutionMapping.user == user_id).delete()
+    db.session.query(RegisteredUser).filter(RegisteredUser.id == user_id).delete()
+    db.session.commit()
+    #db.session.query(RegisteredUser).filter(RegisteredUser.id == user_id).update({'is_removed': True})
     #db.session.commit()
-    db.session.query(RegisteredUser).filter(RegisteredUser.id == user_id).update({'is_removed': True})
-    db.session.commit()
 
-def undo_remove_user(user_id):
-    db.session.query(RegisteredUser).filter(RegisteredUser.id == user_id).update({'is_removed': False})
-    db.session.commit()
+#def undo_remove_user(user_id):
+#    db.session.query(RegisteredUser).filter(RegisteredUser.id == user_id).update({'is_removed': False})
+#    db.session.commit()
 
 def remove_institution(institution_id):
-    db.session.query(Institution).filter(Institution.id == institution_id).update({'is_removed': True})
+    db.session.query(CorpusAccess).filter(CorpusAccess.institution == institution_id).delete()
+    db.session.query(Institution).filter(Institution.id == institution_id).delete()
     db.session.commit()
+    #db.session.query(Institution).filter(Institution.id == institution_id).update({'is_removed': True})
+    #db.session.commit()
 
 
 def del_user_from_institution(user_id, institution_id):
@@ -429,22 +437,22 @@ def del_user_from_institution(user_id, institution_id):
 
 
 def get_all_active_users():
-    return RegisteredUser.query.filter_by(is_removed=False).filter_by(active=True).order_by(RegisteredUser.id).all()
+    return RegisteredUser.query.filter_by(active=True).order_by(RegisteredUser.id).all()
 
 
 def get_all_inactive_users():
-    return RegisteredUser.query.filter_by(is_removed=False).filter_by(active=False).order_by(RegisteredUser.id).all()
+    return RegisteredUser.query.filter_by(active=False).order_by(RegisteredUser.id).all()
 
 
 def get_all_users_join_institutions(active=True):
     #return RegisteredUser.query.filter_by(active=True).order_by(RegisteredUser.id).all()
-    return db.session.query(RegisteredUser, UserInstitutionMapping).filter(RegisteredUser.is_removed==False).outerjoin(UserInstitutionMapping, 
+    return db.session.query(RegisteredUser, UserInstitutionMapping).outerjoin(UserInstitutionMapping, 
             RegisteredUser.id == UserInstitutionMapping.user).filter(RegisteredUser.active == active).order_by(RegisteredUser.id).all()
 
 
 
 def get_all_active_institution_users(institution_id):
-    return RegisteredUser.query.filter_by(is_removed=False).filter_by(active=True).join(UserInstitutionMapping, 
+    return RegisteredUser.query.filter_by(active=True).join(UserInstitutionMapping, 
             RegisteredUser.id == UserInstitutionMapping.user).filter(UserInstitutionMapping.institution == institution_id).all()
 
 
@@ -552,12 +560,6 @@ def send_admins_new_user_notification_mail(user_id, config):
     Nov uporabnik "{}" je ustvaril uporabniški račun na portalu za oddajanje besedil Šolar in čaka na odobritev.
    '''.format(user.name)
 
-    message = MIMEMultipart()
-    message['From'] = config['MAIL_LOGIN']
-    message['To'] = email 
-    message['Subject'] = 'Ponastavitev gesla'
-    message.attach(MIMEText(body, "plain"))
-    text = message.as_string()
 
     admins = RegisteredUser.query.filter_by(role="admin").all()
 
@@ -565,6 +567,12 @@ def send_admins_new_user_notification_mail(user_id, config):
     context = ssl.create_default_context()
 
     for admin in admins:
+        message = MIMEMultipart()
+        message['From'] = config['MAIL_LOGIN']
+        message['To'] = admin.email 
+        message['Subject'] = 'Nova registracija'
+        message.attach(MIMEText(body, "plain"))
+        text = message.as_string()
         try:
             with SMTP_SSL(config['MAIL_HOST'], config['SMTP_PORT'], context=context) as server:
                 server.login(config['MAIL_LOGIN'], config['MAIL_PASS'])
@@ -579,7 +587,7 @@ def send_user_activation_mail(user_id, config):
 
     message = MIMEMultipart()
     message['From'] = config['MAIL_LOGIN']
-    message['To'] = email 
+    message['To'] = user.email 
     message['Subject'] = 'Ponastavitev gesla'
     message.attach(MIMEText(body, "plain"))
     text = message.as_string()