Admin-Controller: Weiterführungslinks zu altem admin.pl gefixt

diff --git a/SL/DB/AuthClient.pm b/SL/DB/AuthClient.pm
index 9e3d3e8ef50e0fdc7e43b343c6c56eccefdd3cf6..e83bb16bf8bff6109e610e041e9213e4381079d7 100644 (file)
--- a/SL/DB/AuthClient.pm
+++ b/SL/DB/AuthClient.pm
@@ -2,6 +2,9 @@ package SL::DB::AuthClient;
 
 use strict;
 
 
 use strict;
 

+use Carp;
+use File::Path ();
+

 use SL::DB::MetaSetup::AuthClient;
 use SL::DB::Manager::AuthClient;
 use SL::DB::Helper::Util;
 use SL::DB::MetaSetup::AuthClient;
 use SL::DB::Manager::AuthClient;
 use SL::DB::Helper::Util;


@@ -23,6 +26,37 @@ __PACKAGE__->meta->add_relationship(
 
 __PACKAGE__->meta->initialize;
 
 
 __PACKAGE__->meta->initialize;
 

+__PACKAGE__->before_save('_before_save_remember_old_name');
+__PACKAGE__->after_save('_after_save_ensure_webdav_symlink_correctness');
+__PACKAGE__->after_delete('_after_delete_delete_webdav_symlink');
+
+sub _before_save_remember_old_name {
+  my ($self) = @_;
+
+  delete $self->{__before_save_remember_old_name};
+  if ($self->id && $::lx_office_conf{features}->{webdav}) {
+    $self->{__before_save_remember_old_name} = SL::DB::AuthClient->new(id => $self->id)->load->name;
+  }
+
+  return 1;
+}
+
+sub _after_save_ensure_webdav_symlink_correctness {
+  my ($self) = @_;
+
+  $self->ensure_webdav_symlink_correctness($self->{__before_save_remember_old_name}) if $self->id && $::lx_office_conf{features}->{webdav};
+  return 1;
+}
+
+sub _after_delete_delete_webdav_symlink {
+  my ($self) = @_;
+
+  return 1 if !$::lx_office_conf{features}->{webdav};
+  my $name = $self->webdav_symlink_basename;
+  unlink "webdav/links/${name}";
+  return 1;
+}
+

 sub validate {
   my ($self) = @_;
 
 sub validate {
   my ($self) = @_;
 


@@ -38,4 +72,40 @@ sub validate {
   return @errors;
 }
 
   return @errors;
 }
 

+sub webdav_symlink_basename {
+  my ($self, $name) =  @_;
+
+  $name             =  $name || $self->name || '';
+  $name             =~ s:/+:_:g;
+
+  return $name;
+}
+
+sub ensure_webdav_symlink_correctness {
+  my ($self, $old_name) = @_;
+
+  return unless $::lx_office_conf{features}->{webdav};
+
+  croak "Need object ID" unless $self->id;
+
+  my $new_symlink = $self->webdav_symlink_basename;
+
+  croak "Need name" unless $new_symlink;
+
+  my $base_path = 'webdav/links';
+
+  if ($old_name) {
+    my $old_symlink = $self->webdav_symlink_basename($old_name);
+    return if $old_symlink eq $new_symlink;
+
+    if (-l "${base_path}/${old_symlink}") {
+      rename "${base_path}/${old_symlink}", "${base_path}/${new_symlink}";
+      return;
+    }
+  }
+
+  File::Path::make_path('webdav/' . $self->id);
+  symlink '../' . $self->id, "${base_path}/${new_symlink}";
+}
+

 1;
 1;

diff --git a/bin/mozilla/admin_printer.pl b/bin/mozilla/admin_printer.pl
index e397868aef2a7265deeca08ee43d0b97d9827104..9d514b3c812508cac25f3986d80d6e38c355f663 100644 (file)
--- a/bin/mozilla/admin_printer.pl
+++ b/bin/mozilla/admin_printer.pl
@@ -20,7 +20,7 @@ sub get_login_form {
 }
 
 sub printer_dispatcher {
 }
 
 sub printer_dispatcher {

-  for my $action (qw(get_login_form list_printers add_printer edit_printer save_printer delete_printer list_users)) {
+  for my $action (qw(get_login_form list_printers add_printer edit_printer save_printer delete_printer)) {

     if ($::form->{$action}) {
       ::call_sub($::locale->findsub($action));
       ::end_of_request()
     if ($::form->{$action}) {
       ::call_sub($::locale->findsub($action));
       ::end_of_request()

diff --git a/templates/webpages/admin/create_dataset.html b/templates/webpages/admin/create_dataset.html
index 991bbc902f0e28f683146dba6ca2021381b01f8c..45938ca68e01f00769bf0566ebe68ff7c76160ca 100644 (file)
--- a/templates/webpages/admin/create_dataset.html
+++ b/templates/webpages/admin/create_dataset.html
@@ -90,7 +90,7 @@
    <input type="hidden" name="dbpasswd"  value="[% HTML.escape(dbpasswd) %]">
    <input type="hidden" name="dbdefault" value="[% HTML.escape(dbdefault) %]">
 
    <input type="hidden" name="dbpasswd"  value="[% HTML.escape(dbpasswd) %]">
    <input type="hidden" name="dbdefault" value="[% HTML.escape(dbdefault) %]">
 

-   <input type="hidden" name="callback" value="admin.pl?action=list_users">
+   <input type="hidden" name="callback" value="controller.pl?action=Admin/show">

 
    <input type="hidden" name="nextsub" value="dbcreate">
 
 
    <input type="hidden" name="nextsub" value="dbcreate">
 

diff --git a/templates/webpages/admin_printer/login.html b/templates/webpages/admin_printer/login.html
index 0948d1bf1b22a000625ab17c3e49a13e518fefc9..7ddee95ea06971fd1bed1c98447560f901fc73f9 100644 (file)
--- a/templates/webpages/admin_printer/login.html
+++ b/templates/webpages/admin_printer/login.html
@@ -9,7 +9,7 @@
 
 <input type='hidden' name='action' value='printer_dispatcher'>
 <p>
 
 <input type='hidden' name='action' value='printer_dispatcher'>
 <p>

-<input type='submit' name='list_users' value='[% 'Back' | $T8 %]'>
+ <a href="controller.pl?action=Admin/show">[% 'Back' | $T8 %]</a>

 <input type='submit' name='list_printers' value='[% 'Continue' | $T8 %]'>
 </p>
 
 <input type='submit' name='list_printers' value='[% 'Continue' | $T8 %]'>
 </p>
 

diff --git a/templates/webpages/dbupgrade/auth/clients.html b/templates/webpages/dbupgrade/auth/clients.html
index d06ef962f57cb2cf95ddf473bea0e8f07aa922cf..15ef02ab8dc34a239bb60fb8430d31ed35466e84 100644 (file)
--- a/templates/webpages/dbupgrade/auth/clients.html
+++ b/templates/webpages/dbupgrade/auth/clients.html
@@ -25,7 +25,7 @@
  [% LxERP.t8("It can be changed later but must be unique within the installation.") %]
 </p>
 
  [% LxERP.t8("It can be changed later but must be unique within the installation.") %]
 </p>
 

-<form method="post" action="admin.pl">
+<form method="post" action="controller.pl">

  [%- FOREACH client = SELF.clients %]
  [%- L.hidden_tag("clients[+].dummy", 1) %]
 
  [%- FOREACH client = SELF.clients %]
  [%- L.hidden_tag("clients[+].dummy", 1) %]
 


@@ -118,7 +118,7 @@
  [%- END %]
 
  <p>
  [%- END %]
 
  <p>

-  [%- L.hidden_tag('action', 'list_users') %]
+  [%- L.hidden_tag('action', 'Admin/apply_dbupgrade_scripts') %]

   [% L.submit_tag('dummy', LxERP.t8('Continue')) %]
  </p>
 </form>
   [% L.submit_tag('dummy', LxERP.t8('Continue')) %]
  </p>
 </form>