jasonLaster / DGD

Dartmouth Group Directory
MIT License
6 stars 3 forks source link

38 flagged pages #39

Closed haplesshero13 closed 12 years ago

haplesshero13 commented 12 years ago

A rudimentary implementation of the Flags admin page. Simply lists all flagged pages, count, and description. Link to Flags page added to the Admin sidebar.

No sidebar implemented yet for a summary of flagged pages. Figured this was more important.

Also fixed bold font on Search Results page.

jasonLaster commented 12 years ago

Will review after dinner.

On May 13, 2012, at 6:54 PM, haplesshero13reply@reply.github.com wrote:

A rudimentary implementation of the Flags admin page. Simply lists all flagged pages, count, and description. Link to Flags page added to the Admin sidebar.

No sidebar implemented yet for a summary of flagged pages. Figured this was more important.

Also fixed bold font on Search Results page.

You can merge this Pull Request by running:

git pull https://github.com/jasonLaster/DGD 38-flagged-pages

Or you can view, comment on it, or merge it online at:

https://github.com/jasonLaster/DGD/pull/39

-- Commit Summary --

  • Enabled Flags page.
  • Merge with Master branch again
  • Only variables should be bolded in search results
  • Fixed problem with SQL query in production vs devel/test
  • Update Flagged Pages page so that groups link to their group page. A rather inefficient query if you ask me, perhaps there is a more direct method (line 2).

-- File Changes --

M app/controllers/admin/flag_controller.rb (4) M app/models/group.rb (2) M app/views/admin/flag/_flag.html.haml (7) M app/views/group/index.html.haml (4) M app/views/sidebar/section/_admin_toc.html.haml (2) M config/routes.rb (67)

-- Patch Links --

https://github.com/jasonLaster/DGD/pull/39.patch https://github.com/jasonLaster/DGD/pull/39.diff


Reply to this email directly or view it on GitHub: https://github.com/jasonLaster/DGD/pull/39

jasonLaster commented 12 years ago

Hey. I just added two big commits to this branch.

in a nutshell - the sql is now railsified and we now group by description instead of group bc groups can have new descriptions but flags pertain to descriptions and not groups. meh - will have to better think through UX issues like admins unflagging. whatever

On May 13, 2012, at 6:54 PM, haplesshero13 wrote:

A rudimentary implementation of the Flags admin page. Simply lists all flagged pages, count, and description. Link to Flags page added to the Admin sidebar.

No sidebar implemented yet for a summary of flagged pages. Figured this was more important.

Also fixed bold font on Search Results page.

You can merge this Pull Request by running:

git pull https://github.com/jasonLaster/DGD 38-flagged-pages

Or you can view, comment on it, or merge it online at:

https://github.com/jasonLaster/DGD/pull/39

-- Commit Summary --

  • Enabled Flags page.
  • Merge with Master branch again
  • Only variables should be bolded in search results
  • Fixed problem with SQL query in production vs devel/test
  • Update Flagged Pages page so that groups link to their group page. A rather inefficient query if you ask me, perhaps there is a more direct method (line 2).

-- File Changes --

M app/controllers/admin/flag_controller.rb (4) M app/models/group.rb (2) M app/views/admin/flag/_flag.html.haml (7) M app/views/group/index.html.haml (4) M app/views/sidebar/section/_admin_toc.html.haml (2) M config/routes.rb (67)

-- Patch Links --

https://github.com/jasonLaster/DGD/pull/39.patch https://github.com/jasonLaster/DGD/pull/39.diff


Reply to this email directly or view it on GitHub: https://github.com/jasonLaster/DGD/pull/39

jasonLaster commented 12 years ago

review this. maybe add tests... wishful thinking... and then if you're happy merge. otherwise bounce it back to me.

Jason

On May 13, 2012, at 6:54 PM, haplesshero13 wrote:

A rudimentary implementation of the Flags admin page. Simply lists all flagged pages, count, and description. Link to Flags page added to the Admin sidebar.

No sidebar implemented yet for a summary of flagged pages. Figured this was more important.

Also fixed bold font on Search Results page.

You can merge this Pull Request by running:

git pull https://github.com/jasonLaster/DGD 38-flagged-pages

Or you can view, comment on it, or merge it online at:

https://github.com/jasonLaster/DGD/pull/39

-- Commit Summary --

  • Enabled Flags page.
  • Merge with Master branch again
  • Only variables should be bolded in search results
  • Fixed problem with SQL query in production vs devel/test
  • Update Flagged Pages page so that groups link to their group page. A rather inefficient query if you ask me, perhaps there is a more direct method (line 2).

-- File Changes --

M app/controllers/admin/flag_controller.rb (4) M app/models/group.rb (2) M app/views/admin/flag/_flag.html.haml (7) M app/views/group/index.html.haml (4) M app/views/sidebar/section/_admin_toc.html.haml (2) M config/routes.rb (67)

-- Patch Links --

https://github.com/jasonLaster/DGD/pull/39.patch https://github.com/jasonLaster/DGD/pull/39.diff


Reply to this email directly or view it on GitHub: https://github.com/jasonLaster/DGD/pull/39

jasonLaster commented 12 years ago

added group by description functionality

haplesshero13 commented 12 years ago

I probably won't get to tests tonight, so I might as well merge this branch in, and keep the branch open, finish the tests tomorrow, and merge those in, as well. Let's try not to work on Master unless it's a bugfix.

Shall we have a new branch for refactor, or should we just work on Master?

I still can't get the spec for Issue #40 to work.

jasonLaster commented 12 years ago

I like what you're saying. Merge it and I'll make a push tonight. The tests can go into master and yea well create a branch and tests for the directory refactor. I'm more cautious there because of the scope of the breakage. I'll also create a staging heroku server soon. Will take a look at 40 tonight.

Jason

On May 13, 2012, at 9:49 PM, haplesshero13reply@reply.github.com wrote:

I probably won't get to tests tonight, so I might as well merge this branch in, and keep the branch open, finish the tests tomorrow, and merge those in, as well. Let's try not to work on Master unless it's a bugfix.

Shall we have a new branch for refactor, or should we just work on Master?

I still can't get the spec for Issue #40 to work.


Reply to this email directly or view it on GitHub: https://github.com/jasonLaster/DGD/pull/39#issuecomment-5681373

jasonLaster commented 12 years ago

I just pulled master and pushed to heroku. a little irresponsible i know, but i was willing to take the risk :) At this point there are no flagged pages, which I guess is a good thing! Very good to know.

Thanks for the work on this one. Want to hack tomorrow night?

On Sunday, May 13, 2012 at 9:57 PM, Jason Laster wrote:

I like what you're saying. Merge it and I'll make a push tonight. The tests can go into master and yea well create a branch and tests for the directory refactor. I'm more cautious there because of the scope of the breakage. I'll also create a staging heroku server soon. Will take a look at 40 tonight.

Jason

On May 13, 2012, at 9:49 PM, haplesshero13<reply@reply.github.com (mailto:reply@reply.github.com)> wrote:

I probably won't get to tests tonight, so I might as well merge this branch in, and keep the branch open, finish the tests tomorrow, and merge those in, as well. Let's try not to work on Master unless it's a bugfix.

Shall we have a new branch for refactor, or should we just work on Master?

I still can't get the spec for Issue #40 to work.


Reply to this email directly or view it on GitHub: https://github.com/jasonLaster/DGD/pull/39#issuecomment-5681373