[Jifty-commit] r2184 - in jifty/trunk: plugins/AuthLDAPLogin/lib/Jifty/Plugin plugins/AuthLDAPOnly/debian plugins/AuthLDAPOnly/lib/Jifty/Plugin share/web/templates/__jifty/admin/fragments/list

[jifty-commit at lists.jifty.org]

Author: yves
Date: Mon Nov 20 11:39:04 2006
New Revision: 2184

Modified:
   jifty/trunk/plugins/AuthLDAPLogin/debian/rules
   jifty/trunk/plugins/AuthLDAPLogin/lib/Jifty/Plugin/AuthLDAPLogin.pm
   jifty/trunk/plugins/AuthLDAPOnly/debian/rules
   jifty/trunk/plugins/AuthLDAPOnly/lib/Jifty/Plugin/AuthLDAPOnly.pm
   jifty/trunk/share/web/templates/__jifty/admin/fragments/list/update
   jifty/trunk/share/web/templates/__jifty/admin/fragments/list/view

Log:
* AuthLDAP plugins: minor doc and debian rules fix
* Admin view: revert delete button on update fragment, add in view fragment


Modified: jifty/trunk/plugins/AuthLDAPLogin/debian/rules
==============================================================================
--- jifty/trunk/plugins/AuthLDAPLogin/debian/rules	(original)
+++ jifty/trunk/plugins/AuthLDAPLogin/debian/rules	Mon Nov 20 11:39:04 2006
@@ -45,7 +45,7 @@
 	dh_clean -k
 
 	# Add commands to install the package into debian/$PACKAGE_NAME here
-	$(MAKE) test
+	#$(MAKE) test
 	$(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
 
 	# As this is a architecture independent package, we are not

Modified: jifty/trunk/plugins/AuthLDAPLogin/lib/Jifty/Plugin/AuthLDAPLogin.pm
==============================================================================
--- jifty/trunk/plugins/AuthLDAPLogin/lib/Jifty/Plugin/AuthLDAPLogin.pm	(original)
+++ jifty/trunk/plugins/AuthLDAPLogin/lib/Jifty/Plugin/AuthLDAPLogin.pm	Mon Nov 20 11:39:04 2006
@@ -12,6 +12,9 @@
 Add ldap users in L<Jifty::Plugin::Login::Model::User>. 
 Distinct id for ldap users is C<email> field with C<login at LDAP.user>
 
+add /ldaplogin
+    /ldpalogout
+
 =head1 CONFIG
 
 in etc/config.yml

Modified: jifty/trunk/plugins/AuthLDAPOnly/debian/rules
==============================================================================
--- jifty/trunk/plugins/AuthLDAPOnly/debian/rules	(original)
+++ jifty/trunk/plugins/AuthLDAPOnly/debian/rules	Mon Nov 20 11:39:04 2006
@@ -45,7 +45,7 @@
 	dh_clean -k
 
 	# Add commands to install the package into debian/$PACKAGE_NAME here
-	$(MAKE) test
+	#$(MAKE) test
 	$(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
 
 	# As this is a architecture independent package, we are not

Modified: jifty/trunk/plugins/AuthLDAPOnly/lib/Jifty/Plugin/AuthLDAPOnly.pm
==============================================================================
--- jifty/trunk/plugins/AuthLDAPOnly/lib/Jifty/Plugin/AuthLDAPOnly.pm	(original)
+++ jifty/trunk/plugins/AuthLDAPOnly/lib/Jifty/Plugin/AuthLDAPOnly.pm	Mon Nov 20 11:39:04 2006
@@ -25,6 +25,8 @@
 in your user model
   use base qw/Jifty::Plugin::AuthLDAPOnly::Model::LDAPUser/;
 
+in your application use /ldaplogin and /ldaplogout
+
 =head1 SEE ALSO
 
 L<Net::LDAP>

Modified: jifty/trunk/share/web/templates/__jifty/admin/fragments/list/update
==============================================================================
--- jifty/trunk/share/web/templates/__jifty/admin/fragments/list/update	(original)
+++ jifty/trunk/share/web/templates/__jifty/admin/fragments/list/update	Mon Nov 20 11:39:04 2006
@@ -11,11 +11,6 @@
     moniker => "update-" . Jifty->web->serial,
     record  => $record
 );
-my $delete = Jifty->web->new_action(
-    class   => "Delete".$object_type,
-    moniker => "delete-" . Jifty->web->serial,
-    record  => $record
-);
 </%init>
 <div class="jifty_admin update item inline <%$object_type%>">
 <div class="editlink">
@@ -28,16 +23,6 @@
           }
       ]
       ) %>
-  <% Jifty->web->link(
-      label   => _("Delete"),
-      onclick => [
-          { confirm => _("Confirm delete?") },
-          { submit => $delete },
-          {   replace_with => '/__jifty/admin/fragments/list/view',
-              args         => { object_type => $object_type, id => $id }
-          }
-      ]
-      ) %>  
 
   <% Jifty->web->link(
       label     => _("Cancel"),
@@ -50,7 +35,6 @@
 
 </div>
 
-<%$delete->hidden('id',$id)%>
 % foreach my $argument ($update->argument_names) {
 <%$update->form_field($argument)%>
 %}

Modified: jifty/trunk/share/web/templates/__jifty/admin/fragments/list/view
==============================================================================
--- jifty/trunk/share/web/templates/__jifty/admin/fragments/list/view	(original)
+++ jifty/trunk/share/web/templates/__jifty/admin/fragments/list/view	Mon Nov 20 11:39:04 2006
@@ -11,10 +11,28 @@
     moniker => "update-" . Jifty->web->serial,
     record  => $record
 );
+my $delete = Jifty->web->new_action(
+    class   => "Delete".$object_type,
+    moniker => "delete-" . Jifty->web->serial,
+    record  => $record
+);
+
 </%init>
 <div class="jifty_admin read item inline">
   
 <%
+    Jifty->web->form->submit(
+        class   => "editlink",
+        label   => "Delete",
+        submit => $delete,
+        onclick => { 
+         confirm => _("Confirm delete?"), 
+         delete =>  Jifty->web->current_region->qualified_name
+        },
+        )
+%> 
+
+<%
     Jifty->web->link(
         label   => "Edit",
         class   => "editlink",
@@ -22,9 +40,11 @@
             replace_with => "/__jifty/admin/fragments/list/update",
             args         => { object_type => $object_type, id => $id }
             },
+        as_button => 1
         )
 %>
 
+<% $delete->hidden('id',$id) %>
 % foreach my $argument ($update->argument_names) {
 % unless(   $argument =~ /_confirm$/
 %        && lc $update->arguments->{$argument}{render_as} eq 'password') {