TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-11-24 06:35:49 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3112 from ErisDS/issue-3008

Browse Source 
Ember post order matches server post order
This commit is contained in:
Hannah Wolfe 2014-06-27 21:59:20 +01:00
commit 39d8136666
2 changed files with 37 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
core/client/controllers/posts.js
View File

@ -15,31 +15,40 @@ var PostsController = Ember.ArrayController.extend({
// published_at: DESC // published_at: DESC
// updated_at: DESC // updated_at: DESC
orderBy: function (item1, item2) { orderBy: function (item1, item2) {
var status1 = item1.get('status'),
status2 = item2.get('status'),
updatedAt1, updatedAt2, function publishedAtCompare() {
publishedAt1, publishedAt2; var published1 = item1.get('published_at'),
published2 = item2.get('published_at');
if (status1 === status2) { if (!published1 && !published2) {
if (status1 === 'draft') { return 0;
updatedAt1 = item1.get('updated_at');
updatedAt2 = item2.get('updated_at');
return (new Date(updatedAt1)) < (new Date(updatedAt2)) ? 1 : -1;
} else {
publishedAt1 = item1.get('published_at');
publishedAt2 = item2.get('published_at');
return (new Date(publishedAt1)) < new Date(publishedAt2) ? 1 : -1;
} }
if (!published1 && published2) {
return -1;
}
if (!published2 && published1) {
return 1;
}
return Ember.compare(item1.get('published_at').valueOf(), item2.get('published_at').valueOf());
} }
if (status2 === 'draft') { var statusResult = Ember.compare(item1.get('status'), item2.get('status')),
return 1; updatedAtResult = Ember.compare(item1.get('updated_at').valueOf(), item2.get('updated_at').valueOf()),
publishedAtResult = publishedAtCompare();
if (statusResult === 0) {
if (publishedAtResult === 0) {
// This should be DESC
return updatedAtResult * -1;
}
// This should be DESC
return publishedAtResult * -1;
} }
return -1; return statusResult;
}, },
// set from PostsRoute // set from PostsRoute

21
core/test/functional/client/content_test.js
View File

@ -3,7 +3,7 @@
/*globals CasperTest, casper, testPost, newUser */ /*globals CasperTest, casper, testPost, newUser */
CasperTest.begin('Content screen is correct', 17, function suite(test) { CasperTest.begin('Content screen is correct', 21, function suite(test) {
// First, create a sample post for testing (this should probably be a routine) // First, create a sample post for testing (this should probably be a routine)
CasperTest.Routines.createTestPost.run(false); CasperTest.Routines.createTestPost.run(false);
@ -55,16 +55,15 @@ CasperTest.begin('Content screen is correct', 17, function suite(test) {
test.assertExists('.post-settings-menu a.delete', 'post settings delete this post exists'); test.assertExists('.post-settings-menu a.delete', 'post settings delete this post exists');
}); });
// A bug is causing this to not always be activated. TODO: Uncomment when fixed #3008 casper.then(function testActiveItem() {
// casper.then(function testActiveItem() { test.assertExists('.content-list-content li:first-of-type .active', 'first item is active');
// test.assertExists('.content-list-content li:first-of-type .active', 'first item is active'); test.assertDoesntExist('.content-list-content li:nth-of-type(2) .active', 'second item is not active');
// test.assertDoesntExist('.content-list-content li:nth-of-type(2) .active', 'second item is not active');
// // Ember adds script tags into the list so we need to use nth-of-type
// // Ember adds script tags into the list so we need to use nth-of-type }).thenClick('.content-list-content li:nth-of-type(2) a', function then() {
// }).thenClick('.content-list-content li:nth-of-type(2) a', function then() { test.assertDoesntExist('.content-list-content li:first-of-type .active', 'first item is not active');
// test.assertDoesntExist('.content-list-content li:first-of-type .active', 'first item is not active'); test.assertExists('.content-list-content li:nth-of-type(2) .active', 'second item is active');
// test.assertExists('.content-list-content li:nth-of-type(2) .active', 'second item is active'); });
// });
}); });
CasperTest.begin('Content list shows correct post status', 7, function testStaticPageStatus(test) { CasperTest.begin('Content list shows correct post status', 7, function testStaticPageStatus(test) {