809 Commits

Author SHA1 Message Date
Adarnof
fd70fb8f03 Revision of hotfix for Issue #89
ensures alliance model exists before checking ID
2015-11-04 23:45:00 +00:00
Adarnof
c4f66e380a Hotfix for Issue #89
Reworked logic to prevent comparison of NoneType alliance ID
2015-11-04 23:35:43 +00:00
Adarnof
6c4520bf58 Update IS_BLUE authserviceinfo field during blue<->member transition 2015-11-04 19:54:14 +00:00
Adarnof
7ad37c2cd2 Corrected typo in run_api_refresh 2015-11-04 17:35:07 +00:00
Brett Costabile
14258afdc1 Merge pull request #1 from Kaezon/TS3-group-management
Ts3 group management
2015-11-03 01:44:24 -05:00
Brett Costabile
c9958ebbb5 Removed all my logging
I'm done. Don't need this anymore.
2015-11-03 01:18:08 -05:00
Brett Costabile
c8d7ea2ca9 FUCKING MAPS AND LISTS
FUUUUUUUUUUUUUUUUUUUUUCK
2015-11-03 00:53:44 -05:00
Brett Costabile
b2eadc2a78 logging
yes more
2015-11-03 00:46:35 -05:00
Brett Costabile
adcbcdaf52 Casting int to str
because it's better than trying to compare them shithead
2015-11-03 00:41:37 -05:00
Brett Costabile
b29d6bd7da Don't need that
Testing
2015-11-02 23:55:20 -05:00
Brett Costabile
5a03565f86 So close
but no qute
2015-11-02 23:43:21 -05:00
Brett Costabile
e9a2cb54b1 Lists and maps
it's important to remember which one you're working with
2015-11-02 23:34:54 -05:00
Brett Costabile
876ac6f3a2 Strings and ints
I was comparing them. That was dumb
2015-11-02 23:30:00 -05:00
Brett Costabile
ba1e11d182 Can I stop yet? 2015-11-02 23:21:38 -05:00
Brett Costabile
bba5bc33c4 Logging
I'm tired
2015-11-02 23:16:59 -05:00
Brett Costabile
d7933f5311 Logging
Even more
2015-11-02 23:08:02 -05:00
Brett Costabile
9c0d980bfa logging
I broke it again
2015-11-02 22:46:26 -05:00
Brett Costabile
385533a9b5 filter
It's not plural
2015-11-02 22:15:24 -05:00
Brett Costabile
560673767a syntax
get some
2015-11-02 22:12:49 -05:00
Brett Costabile
d3d1463404 Version conflict
update_or_insert is from a newer version of django. gotta use .save()
2015-11-02 22:08:32 -05:00
Brett Costabile
425aef081d Add/Remove user need sting inputs
Had to cast groupid to str
2015-11-02 00:49:34 -05:00
Brett Costabile
8a0e3f309d More logging
Groups aren't adding now. Gotta make the logging better in
update_groups()
2015-11-02 00:41:31 -05:00
Brett Costabile
f0527a5479 mistake
forgot to change one instance of groupname to groupid
2015-11-02 00:23:12 -05:00
Brett Costabile
c81b676553 remove_user_from_group
Mirrored changes from add_user_from_group() remove_user_from_group()
2015-11-02 00:14:58 -05:00
Brett Costabile
6abd62960f Small error
If statement with bad syntax
2015-11-01 23:50:26 -05:00
Brett Costabile
7039cffddb Fixing Server Admin assignment
Changed _add_user_to_group() to take group ID instead of group name.
addgroups and remgroups are now lists instead of dictionaries because I
don't need the group names anymore.
Removed debug logging from _add_user_to_group() and send_command()
2015-11-01 23:40:34 -05:00
Brett Costabile
478d855d62 Logging
It looks like the escaping is fine, but there's two "Server Admin"
groups (id3 and id6) which might be messing with the assignment.
2015-11-01 18:19:56 -05:00
Brett Costabile
621de341a8 Logging
I think the issue may be with escaping the whitespace in group names. If
this is the case, I'll have to tweak the code in ts3.py
2015-11-01 18:06:35 -05:00
Brett Costabile
2eb0bd5221 More indentation
Notepad++ was configured to use tabs instead of spaces. That shouldn't
happen anymore.
2015-11-01 17:53:10 -05:00
Brett Costabile
ee3fe5e43e More logging
Added more debug logging to figure out why Server Admin never gets
assigned.
2015-11-01 17:49:53 -05:00
Brett Costabile
df659c4851 Copypaste error
user_ts_group_key should have been ts_group_key
2015-11-01 17:34:01 -05:00
Brett Costabile
94ef8ce694 Indentation
I broke it. Now it's fixed.
2015-11-01 17:32:08 -05:00
Brett Costabile
cddd2b91e4 changed group key type
Why did I even think long was a good idea?
2015-11-01 17:28:41 -05:00
Brett Costabile
2bfbd614e6 Adjusted logging
Changed logging to make a little more sense during debugging
2015-11-01 17:27:04 -05:00
Brett Costabile
0c4694d123 Moved TS3 group update
The group update was being called once for every group the user was in,
but the update function itself already iterates over all the groups and
only needs to be called once per user.
I've moved the execution out of the group iteration so it only gets
called once.
2015-11-01 17:11:40 -05:00
Brett Costabile
b76bc2729c More random changes
Super disorganized here. Trying to get back to a working state
2015-11-01 16:41:16 -05:00
Adarnof
ccda5bf0ae Merge pull request #4 from Adarnof/temp
added corp change handling while auth'd
2015-11-01 01:47:32 -04:00
Adarnof
9402329374 added corp change handling while auth'd 2015-11-01 01:45:40 -04:00
Adarnof
3766272c75 Merge pull request #3 from Adarnof/temp
corrected function parameters
2015-10-31 22:47:53 -04:00
Adarnof
45b0bb5753 corrected function parameters 2015-10-31 22:46:45 -04:00
Adarnof
f2de1a742a Merge pull request #2 from Adarnof/temp
fixed indentation error
2015-10-31 22:36:15 -04:00
Adarnof
e091575453 fixed indentation error 2015-10-31 21:09:57 -04:00
Adarnof
8945cf3a2a Merge pull request #1 from Adarnof/temp
Merge changes in temp branch to orgin toggle branch
2015-10-31 18:32:10 -04:00
Adarnof
984ab31d33 changed templates to reflect corp or alliance toggle
created context processors for IS_CORP, ALLIANCE_ID and ALLIANCE_NAME variables

Signed-off-by: Adarnof <adarnof@gmail.com>
2015-10-31 17:59:27 -04:00
Adarnof
a3de13f055 cleaned up settings descriptions
incorporated alliance/corp check into main character change
restored alliance text to forms
returned optional alliance checking to periodic tasks (pray for me)
deleted accidental inclusion of PID file

this is gonna tickle.

Signed-off-by: Adarnof <adarnof@gmail.com>
2015-10-31 17:35:00 -04:00
Adarnof
8152ae7e29 Removed accidental inclusion of working file. 2015-09-21 09:31:02 +00:00
Adarnof
cf5a099006 Minor fixes regarding HRApplication corp handling 2015-09-21 09:28:54 +00:00
Adarnof
5853b41e58 Abstracted standing level (corp or alliance) depending on toggle 2015-09-20 04:19:30 +00:00
Adarnof
2c98b5e4a6 Re-added corp choice to HRApplicationsw 2015-09-20 03:34:29 +00:00
Adarnof
31a98f86c3 Added corp toggle variable and updated descriptions 2015-09-23 23:11:58 -04:00