Skip to content

Commit 95d0e90

Browse files
AshishThakurnignatov
AshishThakur
authored andcommitted
Issue #2512008 by a_thakur: Fix the typo and make an update hook to fix the roles
1 parent e673805 commit 95d0e90

File tree

4 files changed

+30
-17
lines changed

4 files changed

+30
-17
lines changed

elasticsearch_connector.install

+14
Original file line numberDiff line numberDiff line change
@@ -119,3 +119,17 @@ function elasticsearch_connector_schema() {
119119
function elasticsearch_connector_uninstall() {
120120
variable_del('elasticsearch_connector_get_default_connector');
121121
}
122+
123+
/**
124+
* Implements hook_update_N().
125+
*
126+
* Update permissions.
127+
*/
128+
function elasticsearch_connector_update_7100(&$sandbox) {
129+
db_update('role_permission')
130+
->fields(array(
131+
'permission' => 'administer elasticsearch connector',
132+
))
133+
->condition('permission', 'adminiser elasticsearch connector')
134+
->execute();
135+
}

elasticsearch_connector.module

+14-15
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,10 @@ function elasticsearch_connector_cron() {
4040
* Implements hook_permission().
4141
*/
4242
function elasticsearch_connector_permission() {
43-
// TODO: Fix the typo and make an update hook to fix the roles.
4443
return array(
45-
'adminiser elasticsearch connector' => array(
44+
'administer elasticsearch connector' => array(
4645
'title' => t('Administer elasticsearch connector'),
47-
'description' => t('Giving you access to administer elasticsearch clusters.'),
46+
'description' => t('Provide access to administer elasticsearch clusters.'),
4847
),
4948
);
5049
}
@@ -72,7 +71,7 @@ function elasticsearch_connector_menu() {
7271
'title' => 'Elasticsearch connector',
7372
'description' => 'Administer Elasticsearch connector module',
7473
'position' => 'left',
75-
'access arguments' => array('adminiser elasticsearch connector'),
74+
'access arguments' => array('administer elasticsearch connector'),
7675
'page callback' => 'system_admin_menu_block_page',
7776
'file' => 'system.admin.inc',
7877
'file path' => drupal_get_path('module', 'system'),
@@ -82,7 +81,7 @@ function elasticsearch_connector_menu() {
8281
'title' => 'Elasticsearch Clusters',
8382
'description' => 'Showing all available clusters',
8483
'page callback' => 'elasticsearch_connector_status_page',
85-
'access arguments' => array('adminiser elasticsearch connector'),
84+
'access arguments' => array('administer elasticsearch connector'),
8685
'file' => 'elasticsearch_connector.admin.inc',
8786
'weight' => -10,
8887
);
@@ -92,7 +91,7 @@ function elasticsearch_connector_menu() {
9291
'description' => 'Add new elasticsearch cluster',
9392
'page callback' => 'drupal_get_form',
9493
'page arguments' => array('elasticsearch_connector_edit_cluster'),
95-
'access arguments' => array('adminiser elasticsearch connector'),
94+
'access arguments' => array('administer elasticsearch connector'),
9695
'file' => 'elasticsearch_connector.admin.inc',
9796
'type' => MENU_LOCAL_ACTION,
9897
);
@@ -102,7 +101,7 @@ function elasticsearch_connector_menu() {
102101
'description' => 'Edit cluster settings',
103102
'page callback' => 'drupal_get_form',
104103
'page arguments' => array('elasticsearch_connector_edit_cluster', 4),
105-
'access arguments' => array('adminiser elasticsearch connector'),
104+
'access arguments' => array('administer elasticsearch connector'),
106105
'file' => 'elasticsearch_connector.admin.inc',
107106
'type' => MENU_CALLBACK,
108107
);
@@ -112,7 +111,7 @@ function elasticsearch_connector_menu() {
112111
'description' => 'Elasticsearch cluster info',
113112
'page callback' => 'elasticsearch_connector_info_cluster',
114113
'page arguments' => array(4),
115-
'access arguments' => array('adminiser elasticsearch connector'),
114+
'access arguments' => array('administer elasticsearch connector'),
116115
'file' => 'elasticsearch_connector.admin.inc',
117116
'type' => MENU_CALLBACK,
118117
);
@@ -122,7 +121,7 @@ function elasticsearch_connector_menu() {
122121
'description' => 'Elasticsearch cluster indices',
123122
'page callback' => 'elasticsearch_connector_cluster_indices',
124123
'page arguments' => array(4),
125-
'access arguments' => array('adminiser elasticsearch connector'),
124+
'access arguments' => array('administer elasticsearch connector'),
126125
'file' => 'elasticsearch_connector.admin.inc',
127126
);
128127

@@ -131,7 +130,7 @@ function elasticsearch_connector_menu() {
131130
'description' => 'Add index',
132131
'page callback' => 'drupal_get_form',
133132
'page arguments' => array('elasticsearch_connector_cluster_indices_add', 4),
134-
'access arguments' => array('adminiser elasticsearch connector'),
133+
'access arguments' => array('administer elasticsearch connector'),
135134
'file' => 'elasticsearch_connector.admin.inc',
136135
'type' => MENU_LOCAL_ACTION,
137136
);
@@ -141,7 +140,7 @@ function elasticsearch_connector_menu() {
141140
'description' => 'Elasticsearch cluster indices',
142141
'page callback' => 'drupal_get_form',
143142
'page arguments' => array('elasticsearch_connector_cluster_indices_add', 4, 6),
144-
'access arguments' => array('adminiser elasticsearch connector'),
143+
'access arguments' => array('administer elasticsearch connector'),
145144
'load arguments' => array('%map', '%index'),
146145
'file' => 'elasticsearch_connector.admin.inc',
147146
);
@@ -151,7 +150,7 @@ function elasticsearch_connector_menu() {
151150
'description' => 'Elasticsearch cluster indices',
152151
'page callback' => 'elasticsearch_connector_cluster_indices_aliases',
153152
'page arguments' => array(4, 6),
154-
'access arguments' => array('adminiser elasticsearch connector'),
153+
'access arguments' => array('administer elasticsearch connector'),
155154
'file' => 'elasticsearch_connector.admin.inc',
156155
);
157156

@@ -160,7 +159,7 @@ function elasticsearch_connector_menu() {
160159
'description' => 'Elasticsearch cluster indices',
161160
'page callback' => 'drupal_get_form',
162161
'page arguments' => array('elasticsearch_connector_cluster_indices_delete', 4, 6),
163-
'access arguments' => array('adminiser elasticsearch connector'),
162+
'access arguments' => array('administer elasticsearch connector'),
164163
'file' => 'elasticsearch_connector.admin.inc',
165164
);
166165

@@ -169,14 +168,14 @@ function elasticsearch_connector_menu() {
169168
'description' => 'Delete cluster settings',
170169
'page callback' => 'drupal_get_form',
171170
'page arguments' => array('elasticsearch_connector_delete_cluster', 4),
172-
'access arguments' => array('adminiser elasticsearch connector'),
171+
'access arguments' => array('administer elasticsearch connector'),
173172
'file' => 'elasticsearch_connector.admin.inc',
174173
);
175174

176175
$items['elasticsearch-connector-dialog/redirect/%elasticsearch_connector_cluster/%elasticsearch_connector_index_valid'] = array(
177176
'page callback' => 'elasticsearch_connector_redirect_page',
178177
'page arguments' => array(2, 3),
179-
'access arguments' => array('adminiser elasticsearch connector'),
178+
'access arguments' => array('administer elasticsearch connector'),
180179
);
181180

182181
return $items;

modules/elasticsearch_connector_sequence/elasticsearch_connector_sequence.module

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ function elasticsearch_connector_sequence_menu() {
1818
'description' => 'Setup the sequence module settings.',
1919
'page callback' => 'drupal_get_form',
2020
'page arguments' => array('elasticsearch_connector_sequence_settings'),
21-
'access arguments' => array('adminiser elasticsearch connector'),
21+
'access arguments' => array('administer elasticsearch connector'),
2222
'file' => 'elasticsearch_connector_sequence.admin.inc',
2323
);
2424

modules/elasticsearch_watchdog/elasticsearch_watchdog.module

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ function elasticsearch_watchdog_menu() {
3737
'description' => 'Showing all available clusters',
3838
'page callback' => 'drupal_get_form',
3939
'page arguments' => array('elasticsearch_watchdog_settings'),
40-
'access arguments' => array('adminiser elasticsearch connector'),
40+
'access arguments' => array('administer elasticsearch connector'),
4141
'file' => 'elasticsearch_watchdog.admin.inc',
4242
);
4343

0 commit comments

Comments
 (0)