Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
solo-1
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
solo-1
Commits
0670d4e5
Unverified
Commit
0670d4e5
authored
Sep 26, 2018
by
Liang Ding
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
💥
#12530
parent
b62e4748
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
8 additions
and
4 deletions
+8
-4
src/main/java/org/b3log/solo/event/B3ArticleSender.java
src/main/java/org/b3log/solo/event/B3ArticleSender.java
+1
-0
src/main/java/org/b3log/solo/event/B3ArticleUpdater.java
src/main/java/org/b3log/solo/event/B3ArticleUpdater.java
+1
-0
src/main/java/org/b3log/solo/processor/ArticleProcessor.java
src/main/java/org/b3log/solo/processor/ArticleProcessor.java
+1
-0
src/main/java/org/b3log/solo/service/ArticleQueryService.java
...main/java/org/b3log/solo/service/ArticleQueryService.java
+4
-0
src/test/resources/skins/mobile/side.ftl
src/test/resources/skins/mobile/side.ftl
+0
-3
src/test/resources/skins/mobile/tag-articles.ftl
src/test/resources/skins/mobile/tag-articles.ftl
+1
-1
No files found.
src/main/java/org/b3log/solo/event/B3ArticleSender.java
View file @
0670d4e5
...
@@ -112,6 +112,7 @@ public class B3ArticleSender extends AbstractEventListener<JSONObject> {
...
@@ -112,6 +112,7 @@ public class B3ArticleSender extends AbstractEventListener<JSONObject> {
article
.
put
(
Article
.
ARTICLE_T_AUTHOR_EMAIL
,
authorEmail
);
article
.
put
(
Article
.
ARTICLE_T_AUTHOR_EMAIL
,
authorEmail
);
article
.
put
(
Article
.
ARTICLE_CONTENT
,
originalArticle
.
getString
(
Article
.
ARTICLE_CONTENT
));
article
.
put
(
Article
.
ARTICLE_CONTENT
,
originalArticle
.
getString
(
Article
.
ARTICLE_CONTENT
));
article
.
put
(
Article
.
ARTICLE_T_CREATE_DATE
,
originalArticle
.
getLong
(
Article
.
ARTICLE_CREATED
));
article
.
put
(
Article
.
ARTICLE_T_CREATE_DATE
,
originalArticle
.
getLong
(
Article
.
ARTICLE_CREATED
));
article
.
put
(
Article
.
ARTICLE_T_CREATE_DATE
,
originalArticle
.
getLong
(
Article
.
ARTICLE_UPDATED
));
article
.
put
(
Common
.
POST_TO_COMMUNITY
,
originalArticle
.
getBoolean
(
Common
.
POST_TO_COMMUNITY
));
article
.
put
(
Common
.
POST_TO_COMMUNITY
,
originalArticle
.
getBoolean
(
Common
.
POST_TO_COMMUNITY
));
// Removes this property avoid to persist
// Removes this property avoid to persist
...
...
src/main/java/org/b3log/solo/event/B3ArticleUpdater.java
View file @
0670d4e5
...
@@ -110,6 +110,7 @@ public class B3ArticleUpdater extends AbstractEventListener<JSONObject> {
...
@@ -110,6 +110,7 @@ public class B3ArticleUpdater extends AbstractEventListener<JSONObject> {
article
.
put
(
Article
.
ARTICLE_T_AUTHOR_EMAIL
,
authorEmail
);
article
.
put
(
Article
.
ARTICLE_T_AUTHOR_EMAIL
,
authorEmail
);
article
.
put
(
Article
.
ARTICLE_CONTENT
,
originalArticle
.
getString
(
Article
.
ARTICLE_CONTENT
));
article
.
put
(
Article
.
ARTICLE_CONTENT
,
originalArticle
.
getString
(
Article
.
ARTICLE_CONTENT
));
article
.
put
(
Article
.
ARTICLE_T_CREATE_DATE
,
originalArticle
.
getLong
(
Article
.
ARTICLE_CREATED
));
article
.
put
(
Article
.
ARTICLE_T_CREATE_DATE
,
originalArticle
.
getLong
(
Article
.
ARTICLE_CREATED
));
article
.
put
(
Article
.
ARTICLE_T_UPDATE_DATE
,
originalArticle
.
getLong
(
Article
.
ARTICLE_UPDATED
));
article
.
put
(
Common
.
POST_TO_COMMUNITY
,
originalArticle
.
getBoolean
(
Common
.
POST_TO_COMMUNITY
));
article
.
put
(
Common
.
POST_TO_COMMUNITY
,
originalArticle
.
getBoolean
(
Common
.
POST_TO_COMMUNITY
));
// Removes this property avoid to persist
// Removes this property avoid to persist
...
...
src/main/java/org/b3log/solo/processor/ArticleProcessor.java
View file @
0670d4e5
...
@@ -745,6 +745,7 @@ public class ArticleProcessor {
...
@@ -745,6 +745,7 @@ public class ArticleProcessor {
articleQueryService
.
markdown
(
article
);
articleQueryService
.
markdown
(
article
);
article
.
put
(
Article
.
ARTICLE_T_CREATE_DATE
,
new
Date
(
article
.
optLong
(
Article
.
ARTICLE_CREATED
)));
article
.
put
(
Article
.
ARTICLE_T_CREATE_DATE
,
new
Date
(
article
.
optLong
(
Article
.
ARTICLE_CREATED
)));
article
.
put
(
Article
.
ARTICLE_T_UPDATE_DATE
,
new
Date
(
article
.
optLong
(
Article
.
ARTICLE_UPDATED
)));
// For <meta name="description" content="${article.articleAbstract}"/>
// For <meta name="description" content="${article.articleAbstract}"/>
final
String
metaDescription
=
Jsoup
.
parse
(
article
.
optString
(
Article
.
ARTICLE_ABSTRACT
)).
text
();
final
String
metaDescription
=
Jsoup
.
parse
(
article
.
optString
(
Article
.
ARTICLE_ABSTRACT
)).
text
();
...
...
src/main/java/org/b3log/solo/service/ArticleQueryService.java
View file @
0670d4e5
...
@@ -237,6 +237,7 @@ public class ArticleQueryService {
...
@@ -237,6 +237,7 @@ public class ArticleQueryService {
article
.
put
(
ARTICLE_CREATE_TIME
,
article
.
optLong
(
ARTICLE_CREATED
));
article
.
put
(
ARTICLE_CREATE_TIME
,
article
.
optLong
(
ARTICLE_CREATED
));
article
.
put
(
ARTICLE_T_CREATE_DATE
,
new
Date
(
article
.
optLong
(
ARTICLE_CREATED
)));
article
.
put
(
ARTICLE_T_CREATE_DATE
,
new
Date
(
article
.
optLong
(
ARTICLE_CREATED
)));
article
.
put
(
Article
.
ARTICLE_T_UPDATE_DATE
,
new
Date
(
article
.
optLong
(
ARTICLE_UPDATED
)));
articles
.
add
(
article
);
articles
.
add
(
article
);
}
}
...
@@ -698,6 +699,7 @@ public class ArticleQueryService {
...
@@ -698,6 +699,7 @@ public class ArticleQueryService {
article
.
put
(
ARTICLE_CREATE_TIME
,
article
.
getLong
(
ARTICLE_CREATED
));
article
.
put
(
ARTICLE_CREATE_TIME
,
article
.
getLong
(
ARTICLE_CREATED
));
article
.
put
(
ARTICLE_T_CREATE_DATE
,
new
Date
(
article
.
getLong
(
ARTICLE_CREATED
)));
article
.
put
(
ARTICLE_T_CREATE_DATE
,
new
Date
(
article
.
getLong
(
ARTICLE_CREATED
)));
article
.
put
(
Article
.
ARTICLE_T_UPDATE_DATE
,
new
Date
(
article
.
optLong
(
ARTICLE_UPDATED
)));
ret
.
add
(
article
);
ret
.
add
(
article
);
}
}
...
@@ -750,6 +752,7 @@ public class ArticleQueryService {
...
@@ -750,6 +752,7 @@ public class ArticleQueryService {
article
.
put
(
ARTICLE_CREATE_TIME
,
article
.
getLong
(
ARTICLE_CREATED
));
article
.
put
(
ARTICLE_CREATE_TIME
,
article
.
getLong
(
ARTICLE_CREATED
));
article
.
put
(
ARTICLE_T_CREATE_DATE
,
new
Date
(
article
.
getLong
(
ARTICLE_CREATED
)));
article
.
put
(
ARTICLE_T_CREATE_DATE
,
new
Date
(
article
.
getLong
(
ARTICLE_CREATED
)));
article
.
put
(
Article
.
ARTICLE_T_UPDATE_DATE
,
new
Date
(
article
.
optLong
(
ARTICLE_UPDATED
)));
ret
.
add
(
article
);
ret
.
add
(
article
);
}
}
...
@@ -987,6 +990,7 @@ public class ArticleQueryService {
...
@@ -987,6 +990,7 @@ public class ArticleQueryService {
final
JSONObject
article
=
articles
.
getJSONObject
(
i
);
final
JSONObject
article
=
articles
.
getJSONObject
(
i
);
article
.
put
(
ARTICLE_CREATE_TIME
,
article
.
getLong
(
ARTICLE_CREATED
));
article
.
put
(
ARTICLE_CREATE_TIME
,
article
.
getLong
(
ARTICLE_CREATED
));
article
.
put
(
ARTICLE_T_CREATE_DATE
,
new
Date
(
article
.
optLong
(
ARTICLE_CREATED
)));
article
.
put
(
ARTICLE_T_CREATE_DATE
,
new
Date
(
article
.
optLong
(
ARTICLE_CREATED
)));
article
.
put
(
Article
.
ARTICLE_T_UPDATE_DATE
,
new
Date
(
article
.
optLong
(
ARTICLE_UPDATED
)));
ret
.
add
(
article
);
ret
.
add
(
article
);
}
}
...
...
src/test/resources/skins/mobile/side.ftl
View file @
0670d4e5
...
@@ -94,9 +94,6 @@
...
@@ -94,9 +94,6 @@
<ul>
<ul>
<#list mostUsedTags as tag>
<#list mostUsedTags as tag>
<li>
<li>
<a rel="alternate" href="${servePath}/tag-articles-feed.do?oId=${tag.oId}" class="no-underline">
<img alt="${tag.tagTitle}" src="${staticServePath}/images/feed.png"/>
</a>
<a rel="tag" title="${tag.tagTitle}(${tag.tagPublishedRefCount})" href="${servePath}/tags/${tag.tagTitle?url('UTF-8')}">
<a rel="tag" title="${tag.tagTitle}(${tag.tagPublishedRefCount})" href="${servePath}/tags/${tag.tagTitle?url('UTF-8')}">
${tag.tagTitle}</a>
${tag.tagTitle}</a>
(${tag.tagPublishedRefCount})
(${tag.tagPublishedRefCount})
...
...
src/test/resources/skins/mobile/tag-articles.ftl
View file @
0670d4e5
...
@@ -31,7 +31,7 @@
...
@@ -31,7 +31,7 @@
<div
class=
"content single"
>
<div
class=
"content single"
>
<div
class=
"post"
>
<div
class=
"post"
>
<h2
>
${tag1Label}
<h2
>
${tag1Label}
<a
rel=
"alternate"
href=
"${servePath}/tag
-articles-feed.do?oId=${tag.oId
}"
><span
id=
"tagArticlesTag"
>
<a
rel=
"alternate"
href=
"${servePath}/tag
s/${tag.tagTitle?url('UTF-8')
}"
><span
id=
"tagArticlesTag"
>
${tag.tagTitle}
${tag.tagTitle}
</span>
(${tag.tagPublishedRefCount})
</a>
</span>
(${tag.tagPublishedRefCount})
</a>
</h2>
</h2>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment