[myexperiment-hackers] [2669] trunk/app: Show permissions during authorize phase.

[noreply]

Revision

2669

Author

dtm

Date

2011-08-12 12:33:25 -0400 (Fri, 12 Aug 2011)

Log Message

Show permissions during authorize phase.
Make lost of permissions a little less verbose.

Modified Paths

• trunk/app/controllers/oauth_controller.rb
• trunk/app/views/oauth/_show_permissions.rhtml
• trunk/app/views/oauth/authorize.rhtml

Diff

Modified: trunk/app/controllers/oauth_controller.rb (2668 => 2669)

--- trunk/app/controllers/oauth_controller.rb	2011-08-12 15:03:38 UTC (rev 2668)
+++ trunk/app/controllers/oauth_controller.rb	2011-08-12 16:33:25 UTC (rev 2669)
@@ -31,6 +31,7 @@
   def authorize
     @client_applications=current_user.client_applications
     @token=RequestToken.find_by_token params[:oauth_token]
+    @address@hidden
     redirect_url=params[:oauth_callback]||@token.client_application.callback_url
     if (@token.client_application.key_type == 'System') || @client_applications.include?(@token.client_application)
       unless @token.invalidated?    

Modified: trunk/app/views/oauth/_show_permissions.rhtml (2668 => 2669)

--- trunk/app/views/oauth/_show_permissions.rhtml	2011-08-12 15:03:38 UTC (rev 2668)
+++ trunk/app/views/oauth/_show_permissions.rhtml	2011-08-12 16:33:25 UTC (rev 2669)
@@ -4,8 +4,13 @@
    <% if permissions.length > 0 %>
      <h3><%= category.capitalize %></h3>
      <p>
-     <% for permission in permissions -%>
-       <%= permission %><br/>
+     <% by_resource={};
+        permissions.each { |el| (k,v)=el.split(" ");
+                           by_resource[v]=[] unless by_resource[v];
+                           by_resource[v].push(k) }
+     -%>
+     <% for resource in by_resource.keys.sort -%>
+       <%= resource %> - <%= by_resource[resource].join(", ")%><br/>
      <% end -%>
      </p>
    <% end -%>

Modified: trunk/app/views/oauth/authorize.rhtml (2668 => 2669)

--- trunk/app/views/oauth/authorize.rhtml	2011-08-12 15:03:38 UTC (rev 2668)
+++ trunk/app/views/oauth/authorize.rhtml	2011-08-12 16:33:25 UTC (rev 2669)
@@ -11,4 +11,5 @@
 <p>
 	<%=submit_tag%>
 </p>
-<%end%>
\ No newline at end of file
+<%end%>
+<%= render :partial => "show_permissions" -%>