Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 94a5c241

Von Martin Helmling martin.helmling@octosoft.eu vor etwa 6 Jahren hinzugefügt

  • ID 94a5c2411d601257f8496a375056833ee1ab0b85
  • Vorgänger 2e97532c
  • Nachfolger 84648282

Filemanagement: Mandantenkonfig "Erzeugte Dokumente löschbar" wird nicht berücksichtigt

Dieses Flag wurde bisher noch nirgend berücksichtigt.

fixed Issue #220

Unterschiede anzeigen:

SL/Controller/File.pm
495 495
        'chkall_title' => $main::locale->text('Delete all'),
496 496
        'file_title'   => $main::locale->text('filename'),
497 497
        'confirm_text' => $main::locale->text('delete'),
498
        'can_rename'   => 1,
498
        'can_delete'   => $::instance_conf->get_doc_delete_printfiles,
499
        'can_rename'   => $::instance_conf->get_doc_delete_printfiles,
499 500
        'rename_title' => $main::locale->text('Rename Documents'),
500 501
        'done_text'    => $main::locale->text('deleted')
501 502
      };
......
515 516
          'can_rename'   => 1,
516 517
          'rename_title' => $main::locale->text('Rename Documents'),
517 518
          'can_import'   => 1,
519
          'can_delete'   => 0,
518 520
          'import_title' => $main::locale->text('Add Document from \'#1\'', $scanner_or_mailrx->{name}),
519 521
          'path'         => $scanner_or_mailrx->{directory},
520 522
          'done_text'    => $main::locale->text('unimported')
......
536 538
      'are_existing' => $self->existing ? 1 : 0,
537 539
      'rename_title' => $main::locale->text('Rename Attachments'),
538 540
      'can_upload'   => 1,
541
      'can_delete'   => 1,
539 542
      'upload_title' => $main::locale->text('Upload Attachments'),
540 543
      'done_text'    => $main::locale->text('deleted')
541 544
    };
......
554 557
      'are_existing' => $self->existing ? 1 : 0,
555 558
      'rename_title' => $main::locale->text('Rename Images'),
556 559
      'can_upload'   => 1,
560
      'can_delete'   => 1,
557 561
      'upload_title' => $main::locale->text('Upload Images'),
558 562
      'done_text'    => $main::locale->text('deleted')
559 563
    };
templates/webpages/file/list.html
68 68
    [%- IF source.can_import %]
69 69
      [% L.button_tag("kivi.File.unimport(" _ object_id _ ",'" _ object_type _ "','" _ file_type _ "','" _ checkname _ "');",source.chk_title) %]
70 70
    [%- ELSE %]
71
      [% L.button_tag("kivi.File.delete("   _ object_id _ ",'" _ object_type _ "','" _ file_type _ "','" _ checkname _ "'," _ is_global _ ");",  source.chk_title) %]
71
      [%- IF source.can_delete %]
72
        [% L.button_tag("kivi.File.delete("   _ object_id _ ",'" _ object_type _ "','" _ file_type _ "','" _ checkname _ "'," _ is_global _ ");",  source.chk_title) %]
73
      [%- END %]
72 74
    [%- END %]
73 75
  [%- END %]
74 76
  [%- IF source.can_rename %]

Auch abrufbar als: Unified diff