From c9b769818e41ef5920bac4a2464ebdd898313e05 Mon Sep 17 00:00:00 2001
From: Justin Richer <jricher@mitre.org>
Date: Tue, 5 Mar 2013 13:34:18 -0500
Subject: [PATCH] changed script loading methods to help debugging, fixed
 subjectype data pull

---
 .../src/main/webapp/WEB-INF/tags/footer.tag                 | 6 +++++-
 openid-connect-server/src/main/webapp/resources/js/admin.js | 3 ++-
 .../src/main/webapp/resources/js/client.js                  | 5 +++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/openid-connect-server/src/main/webapp/WEB-INF/tags/footer.tag b/openid-connect-server/src/main/webapp/WEB-INF/tags/footer.tag
index 0b7b2e197..d35fddbaf 100644
--- a/openid-connect-server/src/main/webapp/WEB-INF/tags/footer.tag
+++ b/openid-connect-server/src/main/webapp/WEB-INF/tags/footer.tag
@@ -9,7 +9,11 @@
 <script type="text/javascript" src="resources/js/lib/backbone.js"></script>
 <script type="text/javascript" src="resources/js/lib/purl.js"></script>
 <c:if test="${js != null && js != ''}">
-<script type="text/javascript" src="${js}"></script>
+<script type="text/javascript" src="resources/js/client.js"></script>
+<script type="text/javascript" src="resources/js/grant.js"></script>
+<script type="text/javascript" src="resources/js/scope.js"></script>
+<script type="text/javascript" src="resources/js/whitelist.js"></script>
+<script type="text/javascript" src="resources/js/admin.js"></script>
 </c:if>
 </body>
 </html>
\ No newline at end of file
diff --git a/openid-connect-server/src/main/webapp/resources/js/admin.js b/openid-connect-server/src/main/webapp/resources/js/admin.js
index 20088fee7..870ceb2e5 100644
--- a/openid-connect-server/src/main/webapp/resources/js/admin.js
+++ b/openid-connect-server/src/main/webapp/resources/js/admin.js
@@ -546,11 +546,12 @@ $(function () {
     jQuery.ajaxSetup({async:false});
 
     // load up our model and collection classes
+    /*
     $.get('resources/js/client.js', _load);
     $.get('resources/js/grant.js', _load);
     $.get('resources/js/scope.js', _load);
     $.get('resources/js/whitelist.js', _load);
-    
+    */
     
     var _load = function (templates) {
         $('body').append(templates);
diff --git a/openid-connect-server/src/main/webapp/resources/js/client.js b/openid-connect-server/src/main/webapp/resources/js/client.js
index 3f5f75ef1..7a8d9f681 100644
--- a/openid-connect-server/src/main/webapp/resources/js/client.js
+++ b/openid-connect-server/src/main/webapp/resources/js/client.js
@@ -371,11 +371,12 @@ var ClientFormView = Backbone.View.extend({
             clientUri: $('#clientUri input').val(),
             applicationType: $('#applicationType input').filter(':checked').val(),
             jwksUri: $('#jwksUri input').val(),
-            subjectType: subjectType, // TODO: need a preprocessor?
+            subjectType: $('#applicationType input').filter(':checked').val(),
             
             
             
             // TODO: everything below this line isn't implemented yet
+            /*
             contacts: this.contactsCollection.pluck('item'),
             tokenEndpointAuthMethod: $('#tokenEndpointAuthMethod input').val(), // TODO: this might need to be something different for a single-select?
             responseTypes: responseTypes, // TODO: need a preprocessor?
@@ -394,7 +395,7 @@ var ClientFormView = Backbone.View.extend({
             requestUris: this.requestUrisCollection.pluck('item'),
             resourceIds: this.resourceIdsCollection.pluck('item'),
             reuseRefreshToken: $('#reuseRefreshToken input').is(':checked')
-            
+            */
         });
 
         // post-validate