View | Details | Raw Unified | Return to bug 39190
Collapse All | Expand All

(-)a/admin/sftp_servers.pl (-1 / +1 lines)
Lines 36-42 my ( $template, $borrowernumber, $cookie ) = get_template_and_user( Link Here
36
        template_name => "admin/sftp_servers.tt",
36
        template_name => "admin/sftp_servers.tt",
37
        query         => $input,
37
        query         => $input,
38
        type          => "intranet",
38
        type          => "intranet",
39
        flagsrequired => { parameters => 'manage_sftp_servers' },
39
        flagsrequired => { parameters => 'manage_file_transports' },
40
    }
40
    }
41
);
41
);
42
42
(-)a/api/v1/swagger/paths/config_sftp_servers.yaml (-5 / +5 lines)
Lines 47-53 Link Here
47
          $ref: "../swagger.yaml#/definitions/error"
47
          $ref: "../swagger.yaml#/definitions/error"
48
    x-koha-authorization:
48
    x-koha-authorization:
49
      permissions:
49
      permissions:
50
        parameters: manage_sftp_servers
50
        parameters: manage_file_transports
51
  post:
51
  post:
52
    x-mojo-to: Config::SFTP::Servers#add
52
    x-mojo-to: Config::SFTP::Servers#add
53
    operationId: addSFTPServer
53
    operationId: addSFTPServer
Lines 97-103 Link Here
97
          $ref: "../swagger.yaml#/definitions/error"
97
          $ref: "../swagger.yaml#/definitions/error"
98
    x-koha-authorization:
98
    x-koha-authorization:
99
      permissions:
99
      permissions:
100
        parameters: manage_sftp_servers
100
        parameters: manage_file_transports
101
"/config/sftp_servers/{sftp_server_id}":
101
"/config/sftp_servers/{sftp_server_id}":
102
  get:
102
  get:
103
    x-mojo-to: Config::SFTP::Servers#get
103
    x-mojo-to: Config::SFTP::Servers#get
Lines 139-145 Link Here
139
          $ref: "../swagger.yaml#/definitions/error"
139
          $ref: "../swagger.yaml#/definitions/error"
140
    x-koha-authorization:
140
    x-koha-authorization:
141
      permissions:
141
      permissions:
142
        parameters: manage_sftp_servers
142
        parameters: manage_file_transports
143
  put:
143
  put:
144
    x-mojo-to: Config::SFTP::Servers#update
144
    x-mojo-to: Config::SFTP::Servers#update
145
    operationId: updateSFTPServer
145
    operationId: updateSFTPServer
Lines 190-196 Link Here
190
          $ref: "../swagger.yaml#/definitions/error"
190
          $ref: "../swagger.yaml#/definitions/error"
191
    x-koha-authorization:
191
    x-koha-authorization:
192
      permissions:
192
      permissions:
193
        parameters: manage_sftp_servers
193
        parameters: manage_file_transports
194
  delete:
194
  delete:
195
    x-mojo-to: Config::SFTP::Servers#delete
195
    x-mojo-to: Config::SFTP::Servers#delete
196
    operationId: deleteSFTPServer
196
    operationId: deleteSFTPServer
Lines 233-236 Link Here
233
          $ref: "../swagger.yaml#/definitions/error"
233
          $ref: "../swagger.yaml#/definitions/error"
234
    x-koha-authorization:
234
    x-koha-authorization:
235
      permissions:
235
      permissions:
236
        parameters: manage_sftp_servers
236
        parameters: manage_file_transports
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc (-2 / +2 lines)
Lines 145-151 Link Here
145
        </ul>
145
        </ul>
146
    [% END %]
146
    [% END %]
147
147
148
    [% IF ( CAN_user_parameters_manage_identity_providers || CAN_user_parameters_manage_smtp_servers ||CAN_user_parameters_manage_sftp_servers || CAN_user_parameters_manage_search_targets || CAN_user_parameters_manage_didyoumean || CAN_user_parameters_manage_column_config || CAN_user_parameters_manage_audio_alerts || ( CAN_user_parameters_manage_sms_providers && Koha.Preference('SMSSendDriver') == 'Email' ) || CAN_user_parameters_manage_usage_stats || CAN_user_parameters_manage_additional_fields || ( Koha.Preference('EnableAdvancedCatalogingEditor') && CAN_user_parameters_manage_keyboard_shortcuts ) ) %]
148
    [% IF ( CAN_user_parameters_manage_identity_providers || CAN_user_parameters_manage_smtp_servers ||CAN_user_parameters_manage_file_transports || CAN_user_parameters_manage_search_targets || CAN_user_parameters_manage_didyoumean || CAN_user_parameters_manage_column_config || CAN_user_parameters_manage_audio_alerts || ( CAN_user_parameters_manage_sms_providers && Koha.Preference('SMSSendDriver') == 'Email' ) || CAN_user_parameters_manage_usage_stats || CAN_user_parameters_manage_additional_fields || ( Koha.Preference('EnableAdvancedCatalogingEditor') && CAN_user_parameters_manage_keyboard_shortcuts ) ) %]
149
        <h5>Additional parameters</h5>
149
        <h5>Additional parameters</h5>
150
        <ul>
150
        <ul>
151
            [% IF ( CAN_user_parameters_manage_identity_providers) %]
151
            [% IF ( CAN_user_parameters_manage_identity_providers) %]
Lines 158-164 Link Here
158
            [% IF ( CAN_user_parameters_manage_smtp_servers ) %]
158
            [% IF ( CAN_user_parameters_manage_smtp_servers ) %]
159
                <li><a href="/cgi-bin/koha/admin/smtp_servers.pl">SMTP servers</a></li>
159
                <li><a href="/cgi-bin/koha/admin/smtp_servers.pl">SMTP servers</a></li>
160
            [% END %]
160
            [% END %]
161
            [% IF ( CAN_user_parameters_manage_sftp_servers ) %]
161
            [% IF ( CAN_user_parameters_manage_file_transports ) %]
162
                <li><a href="/cgi-bin/koha/admin/sftp_servers.pl">FTP/SFTP servers</a></li>
162
                <li><a href="/cgi-bin/koha/admin/sftp_servers.pl">FTP/SFTP servers</a></li>
163
            [% END %]
163
            [% END %]
164
            [% IF ( CAN_user_parameters_manage_didyoumean ) %]
164
            [% IF ( CAN_user_parameters_manage_didyoumean ) %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc (-2 / +2 lines)
Lines 193-200 Link Here
193
    [%- CASE 'manage_smtp_servers' -%]
193
    [%- CASE 'manage_smtp_servers' -%]
194
        <span class="sub_permission manage_manage_smtp_servers_subpermission"> Manage SMTP servers </span>
194
        <span class="sub_permission manage_manage_smtp_servers_subpermission"> Manage SMTP servers </span>
195
        <span class="permissioncode">([% name | html %])</span>
195
        <span class="permissioncode">([% name | html %])</span>
196
    [%- CASE 'manage_sftp_servers' -%]
196
    [%- CASE 'manage_file_transports' -%]
197
        <span class="sub_permission manage_manage_sftp_servers_subpermission"> Manage FTP/SFTP servers </span>
197
        <span class="sub_permission manage_manage_file_transports_subpermission"> Manage FTP/SFTP servers </span>
198
        <span class="permissioncode">([% name | html %])</span>
198
        <span class="permissioncode">([% name | html %])</span>
199
    [%- CASE 'manage_column_config' -%]
199
    [%- CASE 'manage_column_config' -%]
200
        <span class="sub_permission manage_column_config_subpermission"> Manage column configuration </span>
200
        <span class="sub_permission manage_column_config_subpermission"> Manage column configuration </span>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt (-2 / +2 lines)
Lines 254-260 Link Here
254
                </dl>
254
                </dl>
255
            [% END %]
255
            [% END %]
256
256
257
            [% IF ( ( CAN_user_parameters_manage_identity_providers || CAN_user_parameters_manage_smtp_servers || CAN_user_parameters_manage_sftp_servers || CAN_user_parameters_manage_search_targets || CAN_user_parameters_manage_didyoumean || CAN_user_parameters_manage_column_config || CAN_user_parameters_manage_audio_alerts || CAN_user_parameters_manage_sms_providers && Koha.Preference('SMSSendDriver') == 'Email' ) || CAN_user_parameters_manage_usage_stats || CAN_user_parameters_manage_additional_fields || CAN_user_parameters_manage_mana || (Koha.Preference('EnableAdvancedCatalogingEditor') && CAN_user_parameters_manage_keyboard_shortcuts) ) %]
257
            [% IF ( ( CAN_user_parameters_manage_identity_providers || CAN_user_parameters_manage_smtp_servers || CAN_user_parameters_manage_file_transports || CAN_user_parameters_manage_search_targets || CAN_user_parameters_manage_didyoumean || CAN_user_parameters_manage_column_config || CAN_user_parameters_manage_audio_alerts || CAN_user_parameters_manage_sms_providers && Koha.Preference('SMSSendDriver') == 'Email' ) || CAN_user_parameters_manage_usage_stats || CAN_user_parameters_manage_additional_fields || CAN_user_parameters_manage_mana || (Koha.Preference('EnableAdvancedCatalogingEditor') && CAN_user_parameters_manage_keyboard_shortcuts) ) %]
258
                <h3>Additional parameters</h3>
258
                <h3>Additional parameters</h3>
259
                <dl>
259
                <dl>
260
                    <!-- <dt><a href="/cgi-bin/koha/admin/printers.pl">Network Printers</a></dt>
260
                    <!-- <dt><a href="/cgi-bin/koha/admin/printers.pl">Network Printers</a></dt>
Lines 273-279 Link Here
273
                        <dt><a href="/cgi-bin/koha/admin/smtp_servers.pl">SMTP servers</a></dt>
273
                        <dt><a href="/cgi-bin/koha/admin/smtp_servers.pl">SMTP servers</a></dt>
274
                        <dd>Define which SMTP servers to use</dd>
274
                        <dd>Define which SMTP servers to use</dd>
275
                    [% END %]
275
                    [% END %]
276
                    [% IF ( CAN_user_parameters_manage_sftp_servers ) %]
276
                    [% IF ( CAN_user_parameters_manage_file_transports ) %]
277
                        <dt><a href="/cgi-bin/koha/admin/sftp_servers.pl">FTP/SFTP servers</a></dt>
277
                        <dt><a href="/cgi-bin/koha/admin/sftp_servers.pl">FTP/SFTP servers</a></dt>
278
                        <dd>Define available FTP/SFTP servers</dd>
278
                        <dd>Define available FTP/SFTP servers</dd>
279
                    [% END %]
279
                    [% END %]
(-)a/t/Koha/Auth/Permissions.t (-2 / +1 lines)
Lines 209-215 subtest 'superlibrarian tests' => sub { Link Here
209
        'CAN_user_parameters_manage_search_targets'                 => 1,
209
        'CAN_user_parameters_manage_search_targets'                 => 1,
210
        'CAN_user_parameters_manage_sms_providers'                  => 1,
210
        'CAN_user_parameters_manage_sms_providers'                  => 1,
211
        'CAN_user_parameters_manage_smtp_servers'                   => 1,
211
        'CAN_user_parameters_manage_smtp_servers'                   => 1,
212
        'CAN_user_parameters_manage_sftp_servers'                   => 1,
212
        'CAN_user_parameters_manage_file_transports'                => 1,
213
        'CAN_user_parameters_manage_sysprefs'                       => 1,
213
        'CAN_user_parameters_manage_sysprefs'                       => 1,
214
        'CAN_user_parameters_manage_transfers'                      => 1,
214
        'CAN_user_parameters_manage_transfers'                      => 1,
215
        'CAN_user_parameters_manage_usage_stats'                    => 1,
215
        'CAN_user_parameters_manage_usage_stats'                    => 1,
216
- 

Return to bug 39190