Skip to content

Commit 6f64305

Browse files
Merge remote-tracking branch couchbase/cheshire-cat into master
* MB-47574: Fix editing a document from a Views Editing page. Change-Id: I21ddb826460458dc37800ade5bcd5754cd0392e6
2 parents 6a3560b + 9cfaae3 commit 6f64305

21 files changed

+79
-1000
lines changed

priv/public/ui/app/mn.app.imports.js

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -121,12 +121,6 @@ let bucketsState = {
121121
lazyLoad: mnLazyload('./mn_admin/mn_buckets_controller.js', 'mnBuckets')
122122
};
123123

124-
let documentsState = {
125-
name: "app.admin.documents.**",
126-
url: "/documents",
127-
lazyLoad: mnLazyload('./mn_admin/mn_documents_controller.js', 'mnDocuments')
128-
};
129-
130124
let authState = {
131125
name: "app.auth.**",
132126
lazyLoad: mnLoadNgModule('./mn.auth.module.js', 'MnAuthModule')
@@ -235,7 +229,27 @@ let mnAppImports = [
235229
MnPoolsServiceModule,
236230
MnElementCraneModule.forRoot(),
237231
UIRouterUpgradeModule.forRoot({
238-
states: [authState, wizardState, overviewState, serversState, bucketsState, logsState, logsListState, alertsState, groupsState, documentsState, gsiState, viewsState, settingsState, sampleBucketState, securityState, collectionsState, XDCRState, sessionState, logRedactionState, auditState]
232+
states: [
233+
authState,
234+
wizardState,
235+
overviewState,
236+
serversState,
237+
bucketsState,
238+
logsState,
239+
logsListState,
240+
alertsState,
241+
groupsState,
242+
gsiState,
243+
viewsState,
244+
settingsState,
245+
sampleBucketState,
246+
securityState,
247+
collectionsState,
248+
XDCRState,
249+
sessionState,
250+
logRedactionState,
251+
auditState
252+
]
239253
}),
240254

241255
//downgradedModules

priv/public/ui/app/mn_admin/mn_documents.html

Lines changed: 0 additions & 11 deletions
This file was deleted.

priv/public/ui/app/mn_admin/mn_documents_control.html

Lines changed: 0 additions & 60 deletions
This file was deleted.

priv/public/ui/app/mn_admin/mn_documents_control_controller.js

Lines changed: 0 additions & 59 deletions
This file was deleted.

priv/public/ui/app/mn_admin/mn_documents_controller.js

Lines changed: 0 additions & 121 deletions
This file was deleted.

priv/public/ui/app/mn_admin/mn_documents_create_dialog.html

Lines changed: 0 additions & 39 deletions
This file was deleted.

priv/public/ui/app/mn_admin/mn_documents_create_dialog_controller.js

Lines changed: 0 additions & 48 deletions
This file was deleted.

0 commit comments

Comments
 (0)