Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Groups sketch #297

Open
wants to merge 41 commits into from
@tmcw

/cc @emacsen @samanpwbb @mvexel

This is not functional yet. I don't think this is a good use of sprint time since it's not day-doable.

  • Get the Model to actually work
  • Finish the form
tmcw and others added some commits
@tmcw tmcw Groups sketch 3807117
@ssinger ssinger Add the ability to creata a new group
This adds a new method to the groups_controller and
creates the database table for groups
f962ff7
@drewda drewda Group memberships
Now users can be members in groups. Migration and model included here… but controller endpoints and tests are outstanding.
bc13ff1
@ssinger ssinger Adding a list all groups view to the group index
This provides a basic listing of all available groups
longer term this will need to look differently
2752398
@ssinger ssinger Add a basic page to view details about a group afeb2e5
@ssinger ssinger Require a user to be logged in to create a group 7966e7f
@drewda drewda Group memberships should clean up after themselves acade4a
@drewda drewda Groups: adding some test coverage d1f9f6a
@drewda

@tmcw, you can check off that first task now.

@Zverik

Are those public groups which all users can enter, or a user can create a private group and let only some people in?

@drewda
@Zverik

yes, groups of friends who'd like to monitor each other mapping.

@drewda drewda Groups: controller and views in progress
I'll be returning to finish and polish.
a1d3186
@drewda

Good to know, @Zverik. I can keep that in mind for the future.

@drewda

Thanks for adding, @systemed. Please keep going if you have more time!

drewda and others added some commits
@drewda drewda Merge branch 'master' into groups-sketch b580cfa
@drewda drewda Groups: member list can be edited 5c9e56b
@systemed systemed Show comment count with diary entries dfa170f
@drewda drewda Groups: each group's map now displays the bounding box of group members 9b4c48b
@drewda drewda Merge branch 'groups-sketch' of github.com:osmlab/openstreetmap-websi…
…te into groups-sketch
fe68faa
@drewda drewda Groups: improvements to the display of members 70792f1
@drewda drewda Groups: on user view page, link to each of their groups 2fde278
@drewda drewda Groups: more improvements to diary entries, so that they can be poste…
…d to groups
d2b11f1
@systemed systemed Make sure group.js is precompiled 8636b9f
@systemed systemed Don't request individual group.js file 3ba2918
@drewda drewda Merge branch 'master' into groups-sketch
Conflicts resolved:
	app/assets/javascripts/application.js
	app/assets/stylesheets/common.css.scss
	app/views/diary_entry/edit.html.erb
5829c56
@drewda drewda putting group.js file in the right place
It should be separate from application.js, as we don't want it loading on the front page (and trying to clobber the main map), and it should be precompiled on production.
6e272db
@drewda drewda group.js: removing reference to createMap() and adding reference to L…
….OSM.zoom()
af1ce54
@drewda drewda Merge commit 'dc877c3d0346531f7f478bad0b7d8c69807cffb5' into groups-s…
…ketch
23fe942
@drewda drewda groups: updating the form to work with the non-table styling 1fee009
@drewda drewda groups: leaders can send a message to all members
closes #11
e91f601
@drewda drewda some tests to go with commit e91f601
related to #11
2e3c901
@drewda drewda Merge branch 'master' into groups-sketch
Conflicts:
	app/views/layouts/site.html.erb
	config/environments/production.rb
d3cd67e
@mvexel

Note that there is a live instance of this at http://groups.apis.dev.openstreetmap.org - so please have a look and work with the functionality in place. You will have to log in and go to your profile page to see the Groups functionality exposed.

@tomhughes
Owner

A few obvious issues I've noticed, firstly, when you join a group you see:

screenshot from 2013-09-24 20 25 26

Which looks like there is a translation missing.

Then on the main group view we see:

screenshot from 2013-09-24 20 25 12

Which has a strange blank space above the list of members, and the title for the list of diary posts is displaced over to the right instead of being about the diary entry.

@tomhughes
Owner

Ah the blank space is where the description should be - we should probably require that groups have at least some minimal description text.

@iandees

...and that %{title} was my screwup when making a change earlier. Should be fixed in the most recent code.

@lxbarth

As the discussion is reviving here I've posted some thoughts on groups I wrote up right after Birmingham. Discussion too broad for this thread, but I wanted to link here as it's relevant: http://www.openstreetmap.org/user/lxbarth/diary/20060

@drewda

@tomhughes right now the description is required to be two characters in length: https://github.com/osmlab/openstreetmap-website/blame/378ad376b4e8049fb9787eb66346db933e7deede/app/models/group.rb#L18 That is, enough to make sure there's some text but not to ensure that it's meaningful or displayable.

@tyrasd
  1. I get the following error message (HTTP code 500) when joining/leaving groups:

    ActionController::RedirectBackError: No HTTP_REFERER was set in the request to this action, so redirect_to :back could not be called successfully. If this is a test, make sure to specify request.env["HTTP_REFERER"].
    

    My browser doesn't send Referer information, so that could be the cause here.

  2. The notification bar (e.g. "You have joined …") apparently doesn't escape html-code. Try joining this group: http://groups.apis.dev.openstreetmap.org/groups/5

@drewda

Good catch on Item 2, @tyrasd ;-)

@systemed

The main todo I was looking at was to get the diary entries properly paginated, but I got lost in a maze of twisty little views, all alike. If someone who actually knows what they're doing would like to fix that, that'd be excellent.

mikelmaron added some commits
@mikelmaron mikelmaron Merge branch 'master' into groups-sketch
Conflicts:
	app/assets/stylesheets/common.css.scss
	app/models/diary_entry.rb
	app/models/user.rb
	app/views/diary_entry/edit.html.erb
	app/views/layouts/_user_menu.html.erb
	config/environments/production.rb
	db/structure.sql
1c1d516
@mikelmaron mikelmaron Added groups view to diary_entry#list; limited entries to 20 on group…
…#show.
a9d0a32
@mikelmaron mikelmaron group changesets. layout tweaks 5f77560
@mikelmaron mikelmaron first rough commit of presets API f034ac5
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Jun 10, 2013
  1. @tmcw

    Groups sketch

    tmcw authored
  2. @ssinger

    Add the ability to creata a new group

    ssinger authored
    This adds a new method to the groups_controller and
    creates the database table for groups
Commits on Jun 11, 2013
  1. @drewda

    Group memberships

    drewda authored
    Now users can be members in groups. Migration and model included here… but controller endpoints and tests are outstanding.
  2. @ssinger

    Adding a list all groups view to the group index

    ssinger authored
    This provides a basic listing of all available groups
    longer term this will need to look differently
  3. @ssinger
  4. @ssinger
  5. @drewda
  6. @drewda
Commits on Jun 12, 2013
  1. @drewda

    Groups: controller and views in progress

    drewda authored
    I'll be returning to finish and polish.
Commits on Jun 13, 2013
  1. @systemed
  2. @systemed
  3. @drewda
  4. @drewda

    Groups: a simple role-based authorization system

    drewda authored
    "leaders" can edit the group and member list; if there is no leader, anyone can step in to become one
  5. @drewda
Commits on Jun 17, 2013
  1. @drewda
  2. @drewda
  3. @systemed
Commits on Jun 18, 2013
  1. @drewda
  2. @drewda
  3. @drewda
  4. @drewda
  5. @drewda
Commits on Jul 15, 2013
  1. @systemed
  2. @systemed
Commits on Aug 5, 2013
  1. @drewda

    Merge branch 'master' into groups-sketch

    drewda authored
    Conflicts resolved:
    	app/assets/javascripts/application.js
    	app/assets/stylesheets/common.css.scss
    	app/views/diary_entry/edit.html.erb
Commits on Aug 6, 2013
  1. @drewda

    putting group.js file in the right place

    drewda authored
    It should be separate from application.js, as we don't want it loading on the front page (and trying to clobber the main map), and it should be precompiled on production.
  2. @drewda
Commits on Aug 9, 2013
  1. @drewda
Commits on Aug 13, 2013
  1. @drewda
  2. @drewda
  3. @drewda

    some tests to go with commit e91f601

    drewda authored
    related to #11
Commits on Sep 24, 2013
  1. @drewda

    Merge branch 'master' into groups-sketch

    drewda authored
    Conflicts:
    	app/views/layouts/site.html.erb
    	config/environments/production.rb
  2. @drewda

    fix for #20

    drewda authored
  3. @iandees
  4. @iandees
  5. @drewda
  6. @drewda
Commits on Jan 23, 2014
  1. @mikelmaron

    Merge branch 'master' into groups-sketch

    mikelmaron authored
    Conflicts:
    	app/assets/stylesheets/common.css.scss
    	app/models/diary_entry.rb
    	app/models/user.rb
    	app/views/diary_entry/edit.html.erb
    	app/views/layouts/_user_menu.html.erb
    	config/environments/production.rb
    	db/structure.sql
Commits on Jan 24, 2014
  1. @mikelmaron
Commits on Jan 31, 2014
  1. @mikelmaron
Commits on Mar 26, 2014
  1. @mikelmaron
Something went wrong with that request. Please try again.