Remove screencasts

grails-samples · Feb 9, 2017 · ec6b2e8 · ec6b2e8
1 parent bdb6936
commit ec6b2e8
Show file tree

Hide file tree

Showing 43 changed files with 11 additions and 1,416 deletions.
diff --git a/fixtures/screencasts.groovy b/fixtures/screencasts.groovy
diff --git a/fixtures/videohosts.groovy b/fixtures/videohosts.groovy
diff --git a/fixtures/wiki.groovy b/fixtures/wiki.groovy
@@ -145,7 +145,7 @@ h4. Other Languages
 def quickStartPage = '''\
 h1. Quick Start
 
-The following makes it simple to start a grails project. There is also a [series of screencasts|http://grails.org/screencast/search?tag=gswg] that will take you from the basics to a full working Grails application.
+The following makes it simple to start a grails project. 
 
 * [Quick Start|#Quick Start]
 ** [Create a Grails project|#Create a Grails project]

diff --git a/grails-app/conf/BootStrap.groovy b/grails-app/conf/BootStrap.groovy
@@ -53,9 +53,7 @@ grails -Dinitial.admin.password=changeit -Dload.fixtures=true prod run-app""")
             fixtureLoader.with {
                 load("users").load("plugins").load("tags", "ratings")
                 [
-                    'videohosts',
                     'wiki',
-                    'screencasts',
                 ].each {
                     load(it)
                 }
@@ -80,10 +78,9 @@ grails -Dinitial.admin.password=changeit -Dload.fixtures=true prod run-app""")
         def admin = Role.findByName(Role.ADMINISTRATOR) ?: new Role(name: Role.ADMINISTRATOR).save(failOnError: true)
         safelyAddPermission admin, "*"
 
-        // Editor can edit pages, add screencasts, etc.
+        // Editor can edit pages, etc.
         def editor = Role.findByName(Role.EDITOR) ?: new Role(name: Role.EDITOR).save(failOnError: true)
         safelyAddPermission editor, "pluginTab:editWikiPage"
-        safelyAddPermission editor, "screencast:create,edit,save,update"
         safelyAddPermission editor, "likeDislike:like,dislike"
 
         // Observer: can't do anything that an anonymous user can't do.

diff --git a/grails-app/conf/Config.groovy b/grails-app/conf/Config.groovy
@@ -119,7 +119,6 @@ searchable {
             root false
             name name: "tag"
         }
-        screencast = [only: ["title", "description"]]
     }
 }
 
@@ -252,7 +251,6 @@ twitter.accessSecret="test"
 
 rest.dateFormat = "yyyy-MM-dd"
 format.date = 'MMM d, yyyy'
-screencasts.page.layout="subpage"
 blog.page.layout="subpage"
 grails.blog.author.evaluator= {
     request.user

diff --git a/grails-app/conf/UrlMappings.groovy b/grails-app/conf/UrlMappings.groovy
@@ -129,8 +129,8 @@ class UrlMappings {
 
         "/blog/delete/$id"(controller: 'blogEntry', action:'delete')
         "/blog"(controller:"blog", action:"list")
-        "/Grails+Screencasts"(controller: "content", action: "screencastLegacy")
-        "/wiki/Grails+Screencasts"(controller: "content", action: "screencastLegacy")
+        "/Grails+Screencasts"(redirect:[url: 'http://guides.grails.org', permanent:true])
+        "/wiki/Grails+Screencasts"(redirect:[url: 'http://guides.grails.org', permanent:true])
 
         "/rateable/rate/$id"(controller: "rateable", action:"rate")
         "/tag/autoCompleteNames"(controller:'tag', action:'autoCompleteNames')
@@ -183,20 +183,15 @@ class UrlMappings {
         "/news/edit/$id"(controller:"newsItem", action:"edit")
         "/blog/view/$author/$title"(controller: "newsItem", action: "legacyShow")
 
-        "/screencasts"(controller: "screencast", action: "list")
-        "/screencasts/add"(controller: "screencast", action: "create")
-        "/screencasts/save"(controller: "screencast", action: "save")
-        "/screencast/search"(controller: "screencast", action: "search")
-        "/screencast/tag/$tag"(controller:"screencast", action:"tagged")
-        "/screencast/$id"(controller: "screencast", action: "show")
-        "/screencast/edit/$id"(controller: "screencast", action: "edit")
+        "/screencasts"(redirect:[url: 'http://guides.grails.org', permanent:true])
+        "/screencast/search"(redirect:[url: 'http://guides.grails.org', permanent:true])
+        "/screencast/tag/$tag"(redirect:[url: 'http://guides.grails.org', permanent:true])
+        "/screencast/$id"(redirect:[url: 'http://guides.grails.org', permanent:true])
 
         "/Testimonials"(redirect:[url:"https://grails.org/#they-use-groovy", permanent:true])
         "/testimonials"(redirect:[url:"https://grails.org/#they-use-groovy", permanent:true])
         "/testimonials/$id"(redirect:[url:"https://grails.org/#they-use-groovy", permanent:true])
 
-        "/screencast/feed"(controller:"screencast", action:"feed")
-        "/screencasts/feed"(controller:"screencast", action:"feed")
         "/comment/add"(controller:"commentable", action:"add")
 
         "/websites"(redirect:[url:"https://grails.org/#they-use-groovy", permanent:true])

diff --git a/grails-app/conf/org/grails/auth/JSecurityAuthFilters.groovy b/grails-app/conf/org/grails/auth/JSecurityAuthFilters.groovy
@@ -62,7 +62,6 @@ class JSecurityAuthFilters {
 
         def requiresPermissions = [
                 pluginTab: ["editWikiPage"],
-                screencast: ["create", "edit", "save", "update"] as Set,
                 likeDislike: ["like", "dislike"] as Set
         ]
         withPermissions(controller: "*", action: "*") {
@@ -158,11 +157,7 @@ class JSecurityAuthFilters {
                 accessControl { permission "plugin:publish:${params.plugin}" }
             }
         }
-        screencasts(controller:"screencast", action:"(edit|create|save|update)") {
-            before = {
-                accessControl { true }
-            }
-        }
+
         blogPosting(controller:"blog", action:"(createEntry|editEntry)") {
             before = {
                 accessControl { true }

diff --git a/grails-app/controllers/org/grails/ContentController.groovy b/grails-app/controllers/org/grails/ContentController.groovy
@@ -573,10 +573,6 @@ class ContentController extends BaseWikiController {
         [newestPlugins: newestPlugins, latestNews: latestNews]
     }
 
-    def screencastLegacy() {
-        redirect controller: "screencast", action: "list", permanent: true
-    }
-
     protected groupResultsByType(searchResult) {
         def resultsAsList = searchResult.results
         def resultsAsMap = searchResultsGroupOrder.collectEntries { key, value -> [value, []] }

diff --git a/grails-app/controllers/org/grails/content/ContentPendingApprovalController.groovy b/grails-app/controllers/org/grails/content/ContentPendingApprovalController.groovy
@@ -2,15 +2,13 @@ package org.grails.content
 
 import org.grails.common.*
 import org.grails.community.*
-import org.grails.learn.screencasts.Screencast
 import org.grails.news.NewsItem
 
 class ContentPendingApprovalController {
     def searchableService
 
     def list() {
         def pendingItems = NewsItem.pending.list()
-        pendingItems.addAll(Screencast.pending.list())
         pendingItems = pendingItems.sort(false) { it.dateCreated }
         def pendingPlugins = org.grails.plugin.PluginPendingApproval.pending.list()
         [pendingItems: pendingItems, pendingPlugins:pendingPlugins]

diff --git a/grails-app/controllers/org/grails/learn/screencasts/ScreencastAdminController.groovy b/grails-app/controllers/org/grails/learn/screencasts/ScreencastAdminController.groovy