Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
solo
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
Commits
30d15c07
Commit
30d15c07
authored
Nov 01, 2015
by
Liang Ding
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
模版变量:管理员
parent
e120dc6d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
7 deletions
+11
-7
nb-configuration.xml
nb-configuration.xml
+1
-0
src/main/java/org/b3log/solo/model/Common.java
src/main/java/org/b3log/solo/model/Common.java
+6
-1
src/main/java/org/b3log/solo/processor/util/Filler.java
src/main/java/org/b3log/solo/processor/util/Filler.java
+4
-6
No files found.
nb-configuration.xml
View file @
30d15c07
...
@@ -7,6 +7,7 @@ therefore it is assumed to be part of version control checkout.
...
@@ -7,6 +7,7 @@ therefore it is assumed to be part of version control checkout.
Without this configuration present, some functionality in the IDE may be limited or fail altogether.
Without this configuration present, some functionality in the IDE may be limited or fail altogether.
-->
-->
<spellchecker-wordlist
xmlns=
"http://www.netbeans.org/ns/spellchecker-wordlist/1"
>
<spellchecker-wordlist
xmlns=
"http://www.netbeans.org/ns/spellchecker-wordlist/1"
>
<word>
admin
</word>
<word>
Favicon
</word>
<word>
Favicon
</word>
</spellchecker-wordlist>
</spellchecker-wordlist>
</project-shared-configuration>
</project-shared-configuration>
src/main/java/org/b3log/solo/model/Common.java
View file @
30d15c07
...
@@ -20,7 +20,7 @@ package org.b3log.solo.model;
...
@@ -20,7 +20,7 @@ package org.b3log.solo.model;
*
*
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @author <a href="mailto:dongxu.wang@acm.org">Dongxu Wang</a>
* @author <a href="mailto:dongxu.wang@acm.org">Dongxu Wang</a>
* @version 1.
3.5.1, Jun 13
, 2015
* @version 1.
4.5.1, Nov 1
, 2015
* @since 0.3.1
* @since 0.3.1
*/
*/
public
final
class
Common
{
public
final
class
Common
{
...
@@ -174,6 +174,11 @@ public final class Common {
...
@@ -174,6 +174,11 @@ public final class Common {
* Key of current user.
* Key of current user.
*/
*/
public
static
final
String
CURRENT_USER
=
"currentUser"
;
public
static
final
String
CURRENT_USER
=
"currentUser"
;
/**
* Key of admin user.
*/
public
static
final
String
ADMIN_USER
=
"adminUser"
;
/**
/**
* Key of enabled multiple user support.
* Key of enabled multiple user support.
...
...
src/main/java/org/b3log/solo/processor/util/Filler.java
View file @
30d15c07
...
@@ -70,7 +70,7 @@ import org.json.JSONObject;
...
@@ -70,7 +70,7 @@ import org.json.JSONObject;
* Filler utilities.
* Filler utilities.
*
*
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.
3.11.11, Aug 3
, 2015
* @version 1.
4.11.11, Nov 1
, 2015
* @since 0.3.1
* @since 0.3.1
*/
*/
@Service
@Service
...
@@ -662,12 +662,10 @@ public class Filler {
...
@@ -662,12 +662,10 @@ public class Filler {
final
JSONObject
result
=
userRepository
.
get
(
query
);
final
JSONObject
result
=
userRepository
.
get
(
query
);
final
JSONArray
users
=
result
.
getJSONArray
(
Keys
.
RESULTS
);
final
JSONArray
users
=
result
.
getJSONArray
(
Keys
.
RESULTS
);
final
List
<
JSONObject
>
userList
=
CollectionUtils
.
jsonArrayToList
(
users
);
final
List
<
JSONObject
>
userList
=
CollectionUtils
.
jsonArrayToList
(
users
);
dataModel
.
put
(
User
.
USERS
,
userList
);
dataModel
.
put
(
User
.
USERS
,
userList
);
for
(
final
JSONObject
user
:
userList
)
{
user
.
remove
(
User
.
USER_EMAIL
);
final
JSONObject
admin
=
userRepository
.
getAdmin
();
user
.
remove
(
User
.
USER_PASSWORD
);
dataModel
.
put
(
Common
.
ADMIN_USER
,
admin
);
}
final
String
skinDirName
=
(
String
)
request
.
getAttribute
(
Keys
.
TEMAPLTE_DIR_NAME
);
final
String
skinDirName
=
(
String
)
request
.
getAttribute
(
Keys
.
TEMAPLTE_DIR_NAME
);
...
...
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