Skip to content
This repository
Browse code

MINOR Fixed hardcoded links from admin/page to admin/pages

  • Loading branch information...
commit 1b3a634a56e7ea6cff635542a25db57c11f8619a 1 parent 8a72b32
Ingo Schommer authored April 18, 2012
6  javascript/CMSMain.Tree.js
@@ -20,7 +20,7 @@
20 20
 									'_class': 'class-' + val.ssclass,
21 21
 									'action': function(obj) {
22 22
 										// TODO Fix hardcoding of link
23  
-										$('.cms-container').loadPanel('admin/page/add/?ParentID=' + id + '&Type=' + val.ssclass);
  23
+										$('.cms-container').loadPanel('admin/pages/add/?ParentID=' + id + '&Type=' + val.ssclass);
24 24
 									}
25 25
 								};
26 26
 							}
@@ -31,7 +31,7 @@
31 31
 									'label': ss.i18n._t('Tree.EditPage'),
32 32
 									'action': function(obj) {
33 33
 										// TODO Fix hardcoding of link
34  
-										$('.cms-container').loadPanel('admin/page/add/show/' + obj.data('id'));
  34
+										$('.cms-container').loadPanel('admin/pages/add/show/' + obj.data('id'));
35 35
 									}
36 36
 								}
37 37
 							};
@@ -41,7 +41,7 @@
41 41
 									'label': ss.i18n._t('Tree.AddSubPage'),
42 42
 									'action': function(obj) {
43 43
 										// TODO Fix hardcoding of link
44  
-										$('.cms-container').loadPanel('admin/page/add/?ParentID=' + obj.data('id'));
  44
+										$('.cms-container').loadPanel('admin/pages/add/?ParentID=' + obj.data('id'));
45 45
 									},
46 46
 									'submenu': allowedChildren
47 47
 								};
10  tests/controller/CMSMainTest.php
@@ -62,7 +62,7 @@ function testPublish() {
62 62
 		//$this->assertRegexp('/Done: Published 4 pages/', $response->getBody())
63 63
 			
64 64
 		/*
65  
-		$response = Director::test("admin/page/publishitems", array(
  65
+		$response = Director::test("admin/pages/publishitems", array(
66 66
 			'ID' => ''
67 67
 			'Title' => ''
68 68
 			'action_publish' => 'Save and publish',
@@ -198,9 +198,9 @@ function testCreationOfTopLevelPage(){
198 198
 
199 199
 		// with insufficient permissions
200 200
 		$cmsUser->logIn();
201  
-		$this->get('admin/page/add');
  201
+		$this->get('admin/pages/add');
202 202
 		$response = $this->post(
203  
-			'admin/page/add/AddForm', 
  203
+			'admin/pages/add/AddForm', 
204 204
 			array('ParentID' => '0', 'ClassName' => 'Page', 'Locale' => 'en_US', 'action_doAdd' => 1)
205 205
 		);
206 206
 		// should redirect, which is a permission error
@@ -208,10 +208,10 @@ function testCreationOfTopLevelPage(){
208 208
 
209 209
 		// with correct permissions
210 210
 		$rootEditUser->logIn();
211  
-		$response = $this->get('admin/page/add');
  211
+		$response = $this->get('admin/pages/add');
212 212
 
213 213
 		$response = $this->post(
214  
-			'admin/page/add/AddForm', 
  214
+			'admin/pages/add/AddForm', 
215 215
 			array('ParentID' => '0', 'ClassName' => 'Page', 'Locale' => 'en_US', 'action_doAdd' => 1)
216 216
 		);
217 217
 
8  tests/controller/CMSPageHistoryControllerTest.php
@@ -85,7 +85,7 @@ function testGetEditForm() {
85 85
 	 * @todo check highlighting for comparing pages.
86 86
 	 */
87 87
 	function testVersionsForm() {
88  
-		$history = $this->get('admin/page/history/show/'. $this->page->ID);
  88
+		$history = $this->get('admin/pages/history/show/'. $this->page->ID);
89 89
 		$form = $this->cssParser()->getBySelector("#Form_VersionsForm");
90 90
 		
91 91
 		$this->assertEquals(1, count($form));
@@ -102,7 +102,7 @@ function testVersionsForm() {
102 102
 	}
103 103
 	
104 104
 	function testVersionsFormTableContainsInformation() {
105  
-		$history = $this->get('admin/page/history/show/'. $this->page->ID);
  105
+		$history = $this->get('admin/pages/history/show/'. $this->page->ID);
106 106
 		$form = $this->cssParser()->getBySelector("#Form_VersionsForm");
107 107
 		$rows = $form[0]->xpath("fieldset/table/tbody/tr");
108 108
 		
@@ -127,7 +127,7 @@ function testVersionsFormTableContainsInformation() {
127 127
 	}
128 128
 	
129 129
 	function testVersionsFormSelectsUnpublishedCheckbox() {
130  
-		$history = $this->get('admin/page/history/show/'. $this->page->ID);
  130
+		$history = $this->get('admin/pages/history/show/'. $this->page->ID);
131 131
 		$checkbox = $this->cssParser()->getBySelector("#Form_VersionsForm #ShowUnpublished input");
132 132
 
133 133
 		$this->assertThat($checkbox[0], $this->logicalNot($this->isNull()));
@@ -136,7 +136,7 @@ function testVersionsFormSelectsUnpublishedCheckbox() {
136 136
 		$this->assertThat($checked, $this->logicalNot($this->stringContains('checked')));
137 137
 		
138 138
 		// viewing an unpublished
139  
-		$history = $this->get('admin/page/history/show/'.$this->page->ID .'/'.$this->versionUnpublishedCheck);
  139
+		$history = $this->get('admin/pages/history/show/'.$this->page->ID .'/'.$this->versionUnpublishedCheck);
140 140
 		$checkbox = $this->cssParser()->getBySelector("#Form_VersionsForm #ShowUnpublished input");
141 141
 
142 142
 		$this->assertThat($checkbox[0], $this->logicalNot($this->isNull()));
2  tests/search/CMSMainSearchFormTest.php
@@ -9,7 +9,7 @@ function testTitleFilter() {
9 9
 		$this->session()->inst_set('loggedInAs', $this->idFromFixture('Member', 'admin'));
10 10
 
11 11
 		$response = $this->get(
12  
-			'admin/page/SearchForm/?' .
  12
+			'admin/pages/SearchForm/?' .
13 13
 			http_build_query(array(
14 14
 				'Title' => 'Page 10',
15 15
 				'FilterClass' => 'CMSSiteTreeFilter_Search',

0 notes on commit 1b3a634

Please sign in to comment.
Something went wrong with that request. Please try again.