Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Feeds
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TeDomum
Feeds
Commits
157675d9
Commit
157675d9
authored
4 years ago
by
Andrew Dolgov
Browse files
Options
Downloads
Patches
Plain Diff
prefs: fix published shared URL dialog
parent
7f080053
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
classes/pref/feeds.php
+4
-4
4 additions, 4 deletions
classes/pref/feeds.php
js/CommonDialogs.js
+6
-4
6 additions, 4 deletions
js/CommonDialogs.js
with
10 additions
and
8 deletions
classes/pref/feeds.php
+
4
−
4
View file @
157675d9
...
...
@@ -1391,10 +1391,10 @@ class Pref_Feeds extends Handler_Protected {
$rss_url
=
htmlspecialchars
(
get_self_url_prefix
()
.
"/public.php?op=rss&id=-2&view-mode=all_articles"
);;
print
"<button dojoType='dijit.form.Button' class='alt-primary'
onclick='CommonDialogs.generatedFeed(-2, false,
\"
$rss_url
\"
)'>"
.
__
(
'Display URL'
)
.
"</button> "
;
print
"
<button class=
\"
alt-danger
\"
dojoType=
\"
dijit.form.Button
\"
onclick=
\"
return Helpers.clearFeedAccessKeys()
\"
>"
.
print
"<button dojoType='dijit.form.Button' class='alt-primary'
onclick='CommonDialogs.generatedFeed(-2, false,
\"
$rss_url
\"
,
\"
"
.
__
(
"Published articles"
)
.
"
\"
)'>"
.
__
(
'Display URL'
)
.
"</button>
<button class=
'
alt-danger
'
dojoType=
'
dijit.form.Button
'
onclick=
'
return Helpers.clearFeedAccessKeys()
'
>"
.
__
(
'Clear all generated URLs'
)
.
"</button> "
;
PluginHost
::
getInstance
()
->
run_hooks
(
PluginHost
::
HOOK_PREFS_TAB_SECTION
,
"prefFeedsPublishedGenerated"
);
...
...
This diff is collapsed.
Click to expand it.
js/CommonDialogs.js
+
6
−
4
View file @
157675d9
...
...
@@ -387,17 +387,19 @@ const CommonDialogs = {
Notify
.
close
();
}
catch
(
e
)
{
this
.
Error
.
report
(
e
);
App
.
Error
.
report
(
e
);
}
});
},
generatedFeed
:
function
(
feed
,
is_cat
,
rss_url
)
{
generatedFeed
:
function
(
feed
,
is_cat
,
rss_url
,
feed_title
)
{
Notify
.
progress
(
"
Loading, please wait...
"
,
true
);
xhrJson
(
"
backend.php
"
,
{
op
:
"
pref-feeds
"
,
method
:
"
getFeedKey
"
,
id
:
feed
,
is_cat
:
is_cat
},
(
reply
)
=>
{
try
{
const
feed_title
=
Feeds
.
getName
(
feed
,
is_cat
);
if
(
!
feed_title
&&
typeof
Feeds
!=
"
undefined
"
)
feed_title
=
Feeds
.
getName
(
feed
,
is_cat
);
const
secret_url
=
rss_url
+
"
&key=
"
+
encodeURIComponent
(
reply
.
link
);
const
dialog
=
new
fox
.
SingleUseDialog
({
...
...
@@ -428,7 +430,7 @@ const CommonDialogs = {
Notify
.
close
();
}
catch
(
e
)
{
this
.
Error
.
report
(
e
);
App
.
Error
.
report
(
e
);
}
});
},
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment