Skip to content

Commit 302aa8b

Browse files
mxmeinholdmxmeinhold
authored
Merge pull request #236 from ComputerScienceHouse/develop
Revert breaking swap
2 parents abaa3cd + b66e2fa commit 302aa8b

17 files changed

+50
-50
lines changed

‎.nvmrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6.3.1
1+
6.3.1

‎conditional/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ def route_errors(error, user_dict=None):
147147
data = dict()
148148

149149
# Handle the case where the header isn't present
150-
if user_dict['uid'] is not None:
150+
if user_dict['username'] is not None:
151151
data['username'] = user_dict['account'].uid
152152
data['name'] = user_dict['account'].cn
153153
else:

‎conditional/blueprints/attendance.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ def display_attendance_cm(user_dict=None):
137137
log.info('Display Committee Meeting Attendance Page')
138138

139139
return render_template('attendance_cm.html',
140-
username=user_dict['uid'],
140+
username=user_dict['username'],
141141
date=datetime.now().strftime("%Y-%m-%d"))
142142

143143

@@ -149,7 +149,7 @@ def display_attendance_ts(user_dict=None):
149149
log.info('Display Technical Seminar Attendance Page')
150150

151151
return render_template('attendance_ts.html',
152-
username=user_dict['uid'],
152+
username=user_dict['username'],
153153
date=datetime.now().strftime("%Y-%m-%d"))
154154

155155

@@ -164,7 +164,7 @@ def display_attendance_hm(user_dict=None):
164164
return redirect("/dashboard")
165165

166166
return render_template('attendance_hm.html',
167-
username=user_dict['uid'],
167+
username=user_dict['username'],
168168
date=datetime.now().strftime("%Y-%m-%d"),
169169
members=get_non_alumni_non_coop(internal=True))
170170

@@ -435,7 +435,7 @@ def get_seminar_attendees(meeting_id):
435435
else:
436436
total_pages = (int(len(all_cm) / 10))
437437
return render_template('attendance_history.html',
438-
username=user_dict['uid'],
438+
username=user_dict['username'],
439439
history=all_meetings,
440440
pending_cm=pend_cm,
441441
pending_ts=pend_ts,

‎conditional/blueprints/co_op.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ def display_co_op_form(user_dict=None):
2424
log.info('Display Co-Op Submission Page')
2525

2626
co_op = CurrentCoops.query.filter(
27-
CurrentCoops.uid == user_dict['uid'], CurrentCoops.date_created > start_of_year()).first()
27+
CurrentCoops.uid == user_dict['username'], CurrentCoops.date_created > start_of_year()).first()
2828

2929
return render_template('co_op.html',
30-
username=user_dict['uid'],
30+
username=user_dict['username'],
3131
year=start_of_year().year,
3232
on_coop=co_op)
3333

@@ -48,14 +48,14 @@ def submit_co_op_form(user_dict=None):
4848

4949
log.info('Submit {} Co-Op'.format(semester))
5050

51-
if CurrentCoops.query.filter(CurrentCoops.uid == user_dict['uid'],
51+
if CurrentCoops.query.filter(CurrentCoops.uid == user_dict['username'],
5252
CurrentCoops.date_created > start_of_year()).first():
5353
return "User has already submitted this form!", 403
5454

5555
# Add to corresponding co-op ldap group
5656
ldap_add_member_to_group(user_dict['account'], semester.lower() + '_coop')
5757

58-
co_op = CurrentCoops(uid=user_dict['uid'], semester=semester)
58+
co_op = CurrentCoops(uid=user_dict['username'], semester=semester)
5959
db.session.add(co_op)
6060
db.session.flush()
6161
db.session.commit()
@@ -106,6 +106,6 @@ def display_co_op_management(user_dict=None):
106106
CurrentCoops.semester != "Neither")]
107107

108108
return render_template("co_op_management.html",
109-
username=user_dict['uid'],
109+
username=user_dict['username'],
110110
co_op=co_op_list,
111111
)

‎conditional/blueprints/conditional.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def display_conditionals(user_dict=None):
3333
Conditional.status == "Pending")]
3434

3535
return render_template('conditional.html',
36-
username=user_dict['uid'],
36+
username=user_dict['username'],
3737
conditionals=conditionals,
3838
conditionals_len=len(conditionals))
3939

‎conditional/blueprints/housing.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ def display_housing(user_dict=None):
5353
housing[room] = [name]
5454
room_list.add(room)
5555

56-
# return names in 'first last (uid)' format
56+
# return names in 'first last (username)' format
5757
return render_template('housing.html',
58-
username=user_dict['uid'],
58+
username=user_dict['username'],
5959
queue=get_housing_queue(ldap_is_eval_director(user_dict['account'])),
6060
housing=housing,
6161
room_list=sorted(list(room_list)))

‎conditional/blueprints/intro_evals.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ def get_fid_cm_count(member_id):
154154
if internal:
155155
return ie_members
156156

157-
# return names in 'first last (uid)' format
157+
# return names in 'first last (username)' format
158158
return render_template('intro_evals.html',
159-
username=user_dict['uid'],
159+
username=user_dict['username'],
160160
members=ie_members)

‎conditional/blueprints/intro_evals_form.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ def display_intro_evals_form(user_dict=None):
2424
if not ldap_is_intromember(user_dict['account']):
2525
return redirect("/dashboard")
2626
eval_data = FreshmanEvalData.query.filter(
27-
FreshmanEvalData.uid == user_dict['uid']).first()
27+
FreshmanEvalData.uid == user_dict['username']).first()
2828

2929
is_open = EvalSettings.query.first().intro_form_active
30-
# return names in 'first last (uid)' format
30+
# return names in 'first last (username)' format
3131
return render_template('intro_evals_form.html',
32-
username=user_dict['uid'],
32+
username=user_dict['username'],
3333
social_events=eval_data.social_events,
3434
other_notes=eval_data.other_notes,
3535
is_open=is_open)
@@ -47,7 +47,7 @@ def submit_intro_evals(user_dict=None):
4747
comments = post_data['comments']
4848

4949
FreshmanEvalData.query.filter(
50-
FreshmanEvalData.uid == user_dict['uid']). \
50+
FreshmanEvalData.uid == user_dict['username']). \
5151
update(
5252
{
5353
'social_events': social_events,

‎conditional/blueprints/logs.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ def display_logs(user_dict=None):
2727

2828
logs = UserLog.query.all()
2929

30-
return render_template("logs.html", logs=logs, username=user_dict['uid'])
30+
return render_template("logs.html", logs=logs, username=user_dict['username'])

‎conditional/blueprints/major_project_submission.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,18 +32,18 @@ def display_major_project(user_dict=None):
3232
'status': p.status,
3333
'description': p.description,
3434
'id': p.id,
35-
'is_owner': bool(user_dict['uid'] == p.uid)
35+
'is_owner': bool(user_dict['username'] == p.uid)
3636
} for p in
3737
MajorProject.query.filter(
3838
MajorProject.date > start_of_year()).order_by(
3939
desc(MajorProject.id))]
4040

4141
major_projects_len = len(major_projects)
42-
# return names in 'first last (uid)' format
42+
# return names in 'first last (username)' format
4343
return render_template('major_project_submission.html',
4444
major_projects=major_projects,
4545
major_projects_len=major_projects_len,
46-
username=user_dict['uid'])
46+
username=user_dict['username'])
4747

4848

4949
@major_project_bp.route('/major_project/submit', methods=['POST'])
@@ -59,7 +59,7 @@ def submit_major_project(user_dict=None):
5959

6060
if name == "" or description == "":
6161
return jsonify({"success": False}), 400
62-
project = MajorProject(user_dict['uid'], name, description)
62+
project = MajorProject(user_dict['username'], name, description)
6363

6464
db.session.add(project)
6565
db.session.commit()
@@ -105,7 +105,7 @@ def major_project_delete(pid, user_dict=None):
105105
).first()
106106
creator = major_project.uid
107107

108-
if creator == user_dict['uid'] or ldap_is_eval_director(user_dict['account']):
108+
if creator == user_dict['username'] or ldap_is_eval_director(user_dict['account']):
109109
MajorProject.query.filter(
110110
MajorProject.id == pid
111111
).delete()

0 commit comments

Comments
 (0)